Merge "FAB-16437 Remove common/mocks from protoutil"

pkj415 · Nov 11, 2019 · 03710df · 03710df
2 parents 7254385 + 6617030
commit 03710df
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/protoutil/commonutils_test.go b/protoutil/commonutils_test.go
@@ -15,15 +15,14 @@ import (
 	cb "github.com/hyperledger/fabric-protos-go/common"
 	pb "github.com/hyperledger/fabric-protos-go/peer"
 	"github.com/hyperledger/fabric/common/crypto"
-	"github.com/hyperledger/fabric/internal/pkg/identity"
 	"github.com/hyperledger/fabric/protoutil/fakes"
 	"github.com/stretchr/testify/assert"
 )
 
 //go:generate counterfeiter -o fakes/signer_serializer.go --fake-name SignerSerializer . signerSerializer
 
 type signerSerializer interface {
-	identity.SignerSerializer
+	Signer
 }
 
 func TestNonceRandomness(t *testing.T) {

diff --git a/protoutil/txutils.go b/protoutil/txutils.go
@@ -13,7 +13,6 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-protos-go/common"
 	"github.com/hyperledger/fabric-protos-go/peer"
-	"github.com/hyperledger/fabric/internal/pkg/identity"
 	"github.com/pkg/errors"
 )
 
@@ -62,7 +61,7 @@ func GetEnvelopeFromBlock(data []byte) (*common.Envelope, error) {
 func CreateSignedEnvelope(
 	txType common.HeaderType,
 	channelID string,
-	signer identity.SignerSerializer,
+	signer Signer,
 	dataMsg proto.Message,
 	msgVersion int32,
 	epoch uint64,
@@ -76,7 +75,7 @@ func CreateSignedEnvelope(
 func CreateSignedEnvelopeWithTLSBinding(
 	txType common.HeaderType,
 	channelID string,
-	signer identity.SignerSerializer,
+	signer Signer,
 	dataMsg proto.Message,
 	msgVersion int32,
 	epoch uint64,
@@ -245,7 +244,7 @@ func CreateProposalResponse(
 	results []byte,
 	events []byte,
 	ccid *peer.ChaincodeID,
-	signingEndorser identity.SignerSerializer,
+	signingEndorser Signer,
 ) (*peer.ProposalResponse, error) {
 	hdr, err := UnmarshalHeader(hdrbytes)
 	if err != nil {
@@ -334,7 +333,7 @@ func CreateProposalResponseFailure(
 
 // GetSignedProposal returns a signed proposal given a Proposal message and a
 // signing identity
-func GetSignedProposal(prop *peer.Proposal, signer identity.SignerSerializer) (*peer.SignedProposal, error) {
+func GetSignedProposal(prop *peer.Proposal, signer Signer) (*peer.SignedProposal, error) {
 	// check for nil argument
 	if prop == nil || signer == nil {
 		return nil, errors.New("nil arguments")
@@ -381,7 +380,7 @@ func MockSignedEndorserProposalOrPanic(
 func MockSignedEndorserProposal2OrPanic(
 	channelID string,
 	cs *peer.ChaincodeSpec,
-	signer identity.SignerSerializer,
+	signer Signer,
 ) (*peer.SignedProposal, *peer.Proposal) {
 	serializedSigner, err := signer.Serialize()
 	if err != nil {

diff --git a/protoutil/txutils_test.go b/protoutil/txutils_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/golang/protobuf/proto"
 	cb "github.com/hyperledger/fabric-protos-go/common"
 	pb "github.com/hyperledger/fabric-protos-go/peer"
-	mockmsp "github.com/hyperledger/fabric/common/mocks/msp"
+
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/hyperledger/fabric/protoutil/fakes"
 	"github.com/stretchr/testify/assert"
@@ -121,8 +121,8 @@ func TestCreateSignedTx(t *testing.T) {
 	var err error
 	prop := &pb.Proposal{}
 
-	signID, err := mockmsp.NewNoopMsp().GetDefaultSigningIdentity()
-	assert.NoError(t, err, "Unexpected error getting signing identity")
+	signID := &fakes.SignerSerializer{}
+	signID.SerializeReturns([]byte("signer"), nil)
 	signerBytes, err := signID.Serialize()
 	assert.NoError(t, err, "Unexpected error serializing signing identity")
 
@@ -240,8 +240,8 @@ func TestCreateSignedTxStatus(t *testing.T) {
 	})
 	assert.NoError(t, err)
 
-	signingID, err := mockmsp.NewNoopMsp().GetDefaultSigningIdentity()
-	assert.NoError(t, err)
+	signingID := &fakes.SignerSerializer{}
+	signingID.SerializeReturns([]byte("signer"), nil)
 	serializedSigningID, err := signingID.Serialize()
 	assert.NoError(t, err)
 	serializedSignatureHeader, err := proto.Marshal(&cb.SignatureHeader{
@@ -343,16 +343,18 @@ func TestGetSignedProposal(t *testing.T) {
 	var signedProp *pb.SignedProposal
 	var err error
 
-	signID, err := mockmsp.NewNoopMsp().GetDefaultSigningIdentity()
-	assert.NoError(t, err, "Unexpected error getting signing identity")
+	sig := []byte("signature")
+
+	signID := &fakes.SignerSerializer{}
+	signID.SignReturns(sig, nil)
 
 	prop := &pb.Proposal{}
 	propBytes, _ := proto.Marshal(prop)
 	signedProp, err = protoutil.GetSignedProposal(prop, signID)
 	assert.NoError(t, err, "Unexpected error getting signed proposal")
 	assert.Equal(t, propBytes, signedProp.ProposalBytes,
 		"Proposal bytes did not match expected value")
-	assert.Equal(t, []byte("signature"), signedProp.Signature,
+	assert.Equal(t, sig, signedProp.Signature,
 		"Signature did not match expected value")
 
 	_, err = protoutil.GetSignedProposal(nil, signID)
@@ -400,8 +402,8 @@ func TestMockSignedEndorserProposal2OrPanic(t *testing.T) {
 	cis := &pb.ChaincodeInvocationSpec{}
 	chainID := "testchannelid"
 	sig := []byte("signature")
-	signID, err := mockmsp.NewNoopMsp().GetDefaultSigningIdentity()
-	assert.NoError(t, err, "Unexpected error getting signing identity")
+	signID := &fakes.SignerSerializer{}
+	signID.SignReturns(sig, nil)
 
 	signedProp, prop = protoutil.MockSignedEndorserProposal2OrPanic(chainID,
 		&pb.ChaincodeSpec{}, signID)
@@ -410,7 +412,7 @@ func TestMockSignedEndorserProposal2OrPanic(t *testing.T) {
 	propBytes, _ := proto.Marshal(prop)
 	assert.Equal(t, propBytes, signedProp.ProposalBytes,
 		"Proposal bytes do not match expected value")
-	err = proto.Unmarshal(prop.Payload, ccProposal)
+	err := proto.Unmarshal(prop.Payload, ccProposal)
 	assert.NoError(t, err, "Expected ChaincodeProposalPayload")
 	err = proto.Unmarshal(ccProposal.Input, cis)
 	assert.NoError(t, err, "Expected ChaincodeInvocationSpec")