[FAB-13171] Address comments: TxSubmitter

- Address comments for tx_submitter.go
  in https://gerrit.hyperledger.org/r/#/c/27227/
- Remove SubmitTransactionWithChan to simplify token client

Change-Id: I1604f4475d7b604f3ba547fc2a5a6432a973c7af
Signed-off-by: Wenjian Qiao <wenjianq@gmail.com>

Author: wenjianqiao

integration/token/token_test.go

@@ -17,6 +17,7 @@ import (
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/integration/nwo"
+	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/token"
 	tokenclient "github.com/hyperledger/fabric/token/client"
 	. "github.com/onsi/ginkgo"
@@ -139,11 +140,12 @@ func RunTokenTransactionSubmit(n *nwo.Network, orderer *nwo.Orderer, peer *nwo.P
 	mockTokenTxBytes, err := proto.Marshal(mockTokenTx)
 	Expect(err).NotTo(HaveOccurred())
 
-	_, txEnvelope, err := txSubmitter.CreateTxEnvelope(mockTokenTxBytes)
+	txEnvelope, _, err := txSubmitter.CreateTxEnvelope(mockTokenTxBytes)
 	Expect(err).NotTo(HaveOccurred())
-	committed, _, err := txSubmitter.SubmitTransaction(txEnvelope, 60)
+	ordererStatus, committed, err := txSubmitter.Submit(txEnvelope, 60*time.Second)
 	Expect(err).NotTo(HaveOccurred())
 	Expect(committed).To(Equal(true))
+	Expect(*ordererStatus).To(Equal(common.Status_SUCCESS))
 }
 
 // update configtx.yaml with V1_4_FABTOKEN_EXPERIMENTAL: true

token/client/client_suite_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/proto"
+	pb "github.com/hyperledger/fabric/protos/peer"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
@@ -24,3 +25,20 @@ func ProtoMarshal(m proto.Message) []byte {
 
 	return bytes
 }
+
+func createFilteredBlock(channelId string, validationCode pb.TxValidationCode, txIDs ...string) *pb.FilteredBlock {
+	var filteredTransactions []*pb.FilteredTransaction
+	for _, txID := range txIDs {
+		ft := &pb.FilteredTransaction{
+			Txid:             txID,
+			TxValidationCode: validationCode,
+		}
+		filteredTransactions = append(filteredTransactions, ft)
+	}
+	fb := &pb.FilteredBlock{
+		Number:               0,
+		ChannelId:            channelId,
+		FilteredTransactions: filteredTransactions,
+	}
+	return fb
+}

token/client/deliver_client.go

@@ -18,6 +18,7 @@ import (
 	"github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	pb "github.com/hyperledger/fabric/protos/peer"
+	tk "github.com/hyperledger/fabric/token"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/status"
@@ -100,7 +101,7 @@ func (d *deliverClient) Certificate() *tls.Certificate {
 }
 
 // create a signed envelope with SeekPosition_Newest for block
-func CreateDeliverEnvelope(channelId string, creator []byte, signer SignerIdentity, cert *tls.Certificate) (*common.Envelope, error) {
+func CreateDeliverEnvelope(channelId string, creator []byte, signingIdentity tk.SigningIdentity, cert *tls.Certificate) (*common.Envelope, error) {
 	var tlsCertHash []byte
 	var err error
 	// check for client certificate and compute SHA2-256 on certificate if present
@@ -143,7 +144,7 @@ func CreateDeliverEnvelope(channelId string, creator []byte, signer SignerIdenti
 		return nil, errors.Wrap(err, "error marshaling SeekInfo")
 	}
 
-	envelope, err := CreateEnvelope(raw, header, signer)
+	envelope, err := CreateEnvelope(raw, header, signingIdentity)
 	if err != nil {
 		return nil, err
 	}
@@ -160,7 +161,7 @@ func DeliverSend(df DeliverFiltered, address string, envelope *common.Envelope)
 	return nil
 }
 
-func DeliverReceive(df DeliverFiltered, address string, txid string, eventCh chan TxEvent) error {
+func DeliverReceive(df DeliverFiltered, address string, txid string, eventCh chan<- TxEvent) error {
 	event := TxEvent{
 		Txid:       txid,
 		Committed:  false,
@@ -213,7 +214,7 @@ read:
 // DeliverWaitForResponse waits for either eventChan has value (i.e., response has been received) or ctx is timed out
 // This function assumes that the eventCh is only for the specified txid
 // If an eventCh is shared by multiple transactions, a loop should be used to listen to events from multiple transactions
-func DeliverWaitForResponse(ctx context.Context, eventCh chan TxEvent, txid string) (bool, error) {
+func DeliverWaitForResponse(ctx context.Context, eventCh <-chan TxEvent, txid string) (bool, error) {
 	select {
 	case event, _ := <-eventCh:
 		if txid == event.Txid {

token/client/deliver_client_test.go

@@ -21,7 +21,13 @@ import (
 	"github.com/pkg/errors"
 )
 
-var _ = Describe("OrdererClient", func() {
+//go:generate counterfeiter -o mock/deliver_server.go -fake-name DeliverServer . deliverServer
+
+type deliverServer interface {
+	pb.DeliverServer
+}
+
+var _ = Describe("DeliverClient", func() {
 	var (
 		channelId             string
 		creator               []byte
@@ -31,7 +37,7 @@ var _ = Describe("OrdererClient", func() {
 		deliverResp *pb.DeliverResponse
 		fakeTxid    string
 
-		fakeSigner          *mock.SignerIdentity
+		fakeSigningIdentity *mock.SigningIdentity
 		fakeDeliverFiltered *mock.DeliverFiltered
 	)
 
@@ -64,13 +70,13 @@ var _ = Describe("OrdererClient", func() {
 		}
 		expectedPayloadData = ProtoMarshal(seekInfo)
 
-		fakeSigner = &mock.SignerIdentity{}
-		fakeSigner.SignReturns([]byte("envelop-signature"), nil)
+		fakeSigningIdentity = &mock.SigningIdentity{}
+		fakeSigningIdentity.SignReturns([]byte("envelop-signature"), nil)
 
 		fakeTxid = "test_txid_123"
 		deliverResp = &pb.DeliverResponse{
 			Type: &pb.DeliverResponse_FilteredBlock{
-				FilteredBlock: createFilteredBlock(channelId, fakeTxid),
+				FilteredBlock: createFilteredBlock(channelId, pb.TxValidationCode_VALID, fakeTxid),
 			},
 		}
 		fakeDeliverFiltered = &mock.DeliverFiltered{}
@@ -81,7 +87,7 @@ var _ = Describe("OrdererClient", func() {
 
 	Describe("CreateDeliverEnvelope", func() {
 		It("returns expected envelope", func() {
-			envelope, err := client.CreateDeliverEnvelope(channelId, creator, fakeSigner, nil)
+			envelope, err := client.CreateDeliverEnvelope(channelId, creator, fakeSigningIdentity, nil)
 			Expect(err).NotTo(HaveOccurred())
 
 			payload := common.Payload{}
@@ -105,18 +111,18 @@ var _ = Describe("OrdererClient", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(signatureHeader.Creator).To(Equal(creator))
 
-			Expect(fakeSigner.SignCallCount()).To(Equal(1))
-			raw := fakeSigner.SignArgsForCall(0)
+			Expect(fakeSigningIdentity.SignCallCount()).To(Equal(1))
+			raw := fakeSigningIdentity.SignArgsForCall(0)
 			Expect(raw).To(Equal(envelope.Payload))
 		})
 
-		Context("when SignerIdentity returns error", func() {
+		Context("when SigningIdentity returns error", func() {
 			BeforeEach(func() {
-				fakeSigner.SignReturns(nil, errors.New("flying-pineapple"))
+				fakeSigningIdentity.SignReturns(nil, errors.New("flying-pineapple"))
 			})
 
 			It("returns an error", func() {
-				_, err := client.CreateDeliverEnvelope(channelId, creator, fakeSigner, nil)
+				_, err := client.CreateDeliverEnvelope(channelId, creator, fakeSigningIdentity, nil)
 				Expect(err).To(MatchError("flying-pineapple"))
 			})
 		})