[FAB-8965] Rename verifiers to verifier

Change-Id: I9194dbfba66de5c2fdd550a487fdcc5801498990 Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Mar 19, 2018 · ce37463 · ce37463
1 parent e131b61
commit ce37463
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/pkg/client/channel/invoke/signature.go b/pkg/client/channel/invoke/signature.go
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package invoke
 
 import (
-	"github.com/hyperledger/fabric-sdk-go/pkg/client/common/verifiers"
+	"github.com/hyperledger/fabric-sdk-go/pkg/client/common/verifier"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
 
 	"github.com/pkg/errors"
@@ -49,6 +49,6 @@ func (f *SignatureValidationHandler) validate(txProposalResponse []*fab.Transact
 }
 
 func verifyProposalResponse(res *fab.TransactionProposalResponse, ctx *ClientContext) error {
-	sv := &verifiers.Signature{Membership: ctx.Membership}
+	sv := &verifier.Signature{Membership: ctx.Membership}
 	return sv.Verify(res)
 }
diff --git a/pkg/client/common/verifiers/signature.go → pkg/client/common/verifier/signature.go b/pkg/client/common/verifiers/signature.go → pkg/client/common/verifier/signature.go
@@ -4,8 +4,8 @@ Copyright SecureKey Technologies Inc. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-// Package verifiers provides various verifiers (e.g. signature)
-package verifiers
+// Package verifier provides various verifier (e.g. signature)
+package verifier
 
 import (
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/logging"

diff --git a/pkg/client/ledger/ledger.go b/pkg/client/ledger/ledger.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 
-	"github.com/hyperledger/fabric-sdk-go/pkg/client/common/verifiers"
+	"github.com/hyperledger/fabric-sdk-go/pkg/client/common/verifier"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/context"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
 	"github.com/hyperledger/fabric-sdk-go/pkg/util/errors/status"
@@ -41,7 +41,7 @@ type Client struct {
 	ctx      context.Channel
 	filter   fab.TargetFilter
 	ledger   *channel.Ledger
-	verifier *verifiers.Signature
+	verifier *verifier.Signature
 }
 
 // mspFilter is default filter
@@ -79,7 +79,7 @@ func New(channelProvider context.ChannelProvider, opts ...ClientOption) (*Client
 	ledgerClient := Client{
 		ctx:      channelContext,
 		ledger:   ledger,
-		verifier: &verifiers.Signature{Membership: membership},
+		verifier: &verifier.Signature{Membership: membership},
 	}
 
 	for _, opt := range opts {

diff --git a/pkg/client/resmgmt/resmgmt.go b/pkg/client/resmgmt/resmgmt.go
@@ -15,7 +15,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/hyperledger/fabric-sdk-go/pkg/client/common/verifiers"
+	"github.com/hyperledger/fabric-sdk-go/pkg/client/common/verifier"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/msp"
@@ -493,7 +493,7 @@ func (rc *Client) QueryInstantiatedChaincodes(channelID string, options ...Reque
 		return nil, errors.WithMessage(err, "membership creation failed")
 	}
 
-	responses, err := l.QueryInstantiatedChaincodes(reqCtx, []fab.ProposalProcessor{target}, &verifiers.Signature{Membership: membership})
+	responses, err := l.QueryInstantiatedChaincodes(reqCtx, []fab.ProposalProcessor{target}, &verifier.Signature{Membership: membership})
 	if err != nil {
 		return nil, err
 	}
@@ -591,7 +591,7 @@ func (rc *Client) sendCCProposal(reqCtx reqContext.Context, ccProposalType chain
 	}
 
 	// Verify signature(s)
-	sv := &verifiers.Signature{Membership: membership}
+	sv := &verifier.Signature{Membership: membership}
 	for _, r := range txProposalResponse {
 		if err := sv.Verify(r); err != nil {
 			return errors.WithMessage(err, "Failed to verify signature")