[FAB-5681] Expose ability to SendTransactionProposal

Firas Qutishat · Firas Qutishat · commit 6ed4b849f2ec · 2017-08-09T11:12:09.000-04:00
-Rename sendTransactionProposal TO SendTransactionProposalWithChannelID

Change-Id: I410ac28b8875f5aa5ac615e3c0c3e2cf25a687cf
Signed-off-by: Firas Qutishat &lt;firas.qutishat@securekey.com&gt;
diff --git a/pkg/fabric-client/channel/query.go b/pkg/fabric-client/channel/query.go
@@ -183,7 +183,7 @@ func queryByChaincode(channelID string, request txn.ChaincodeInvokeRequest, clie
 		return nil, err
 	}
 
-	transactionProposalResponses, _, err := sendTransactionProposal(channelID, request, clientContext)
+	transactionProposalResponses, _, err := SendTransactionProposalWithChannelID(channelID, request, clientContext)
 	if err != nil {
 		return nil, fmt.Errorf("SendTransactionProposal return error: %v", err)
 	}
diff --git a/pkg/fabric-client/channel/txnproposer.go b/pkg/fabric-client/channel/txnproposer.go
@@ -31,12 +31,12 @@ func (c *Channel) SendTransactionProposal(request apitxn.ChaincodeInvokeRequest)
 		return nil, apitxn.TransactionID{}, err
 	}
 
-	return sendTransactionProposal(c.name, request, c.clientContext)
+	return SendTransactionProposalWithChannelID(c.name, request, c.clientContext)
 }
 
-// sendTransactionProposal sends the created proposal to peer for endorsement.
+// SendTransactionProposalWithChannelID sends the created proposal to peer for endorsement.
 // TODO: return the entire request or just the txn ID?
-func sendTransactionProposal(channelID string, request apitxn.ChaincodeInvokeRequest, clientContext ClientContext) ([]*apitxn.TransactionProposalResponse, apitxn.TransactionID, error) {
+func SendTransactionProposalWithChannelID(channelID string, request apitxn.ChaincodeInvokeRequest, clientContext ClientContext) ([]*apitxn.TransactionProposalResponse, apitxn.TransactionID, error) {
 	if err := validateChaincodeInvokeRequest(request); err != nil {
 		return nil, apitxn.TransactionID{}, fmt.Errorf("Required parameters are empty: %s", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func queryByChaincode(channelID string, request txn.ChaincodeInvokeRequest, clie`
`183`	`183`	`return nil, err`
`184`	`184`	`}`
`185`	`185`
`186`		`- transactionProposalResponses, _, err := sendTransactionProposal(channelID, request, clientContext)`
	`186`	`+ transactionProposalResponses, _, err := SendTransactionProposalWithChannelID(channelID, request, clientContext)`
`187`	`187`	`if err != nil {`
`188`	`188`	`return nil, fmt.Errorf("SendTransactionProposal return error: %v", err)`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ func (c *Channel) SendTransactionProposal(request apitxn.ChaincodeInvokeRequest)`
`31`	`31`	`return nil, apitxn.TransactionID{}, err`
`32`	`32`	`}`
`33`	`33`
`34`		`- return sendTransactionProposal(c.name, request, c.clientContext)`
	`34`	`+ return SendTransactionProposalWithChannelID(c.name, request, c.clientContext)`
`35`	`35`	`}`
`36`	`36`
`37`		`-// sendTransactionProposal sends the created proposal to peer for endorsement.`
	`37`	`+// SendTransactionProposalWithChannelID sends the created proposal to peer for endorsement.`
`38`	`38`	`// TODO: return the entire request or just the txn ID?`
`39`		`-func sendTransactionProposal(channelID string, request apitxn.ChaincodeInvokeRequest, clientContext ClientContext) ([]*apitxn.TransactionProposalResponse, apitxn.TransactionID, error) {`
	`39`	`+func SendTransactionProposalWithChannelID(channelID string, request apitxn.ChaincodeInvokeRequest, clientContext ClientContext) ([]*apitxn.TransactionProposalResponse, apitxn.TransactionID, error) {`
`40`	`40`	`if err := validateChaincodeInvokeRequest(request); err != nil {`
`41`	`41`	`return nil, apitxn.TransactionID{}, fmt.Errorf("Required parameters are empty: %s", err)`
`42`	`42`	`}`