Add WithInit() to support chaincodes that require init (#236)

* Add SubmitInit() to support chaincodes that require init

Signed-off-by: Jim Zhang <[email protected]>

* Change to using options in CreateTransaction

Signed-off-by: Jim Zhang <[email protected]>

Author: jimthematrix

pkg/gateway/transaction.go

@@ -29,6 +29,7 @@ type Transaction struct {
 	request        *channel.Request
 	endorsingPeers []string
 	collections    []string
+	isInit         bool
 	eventch        chan *fab.TxStatusEvent
 }
 
@@ -83,6 +84,15 @@ func WithCollections(collections ...string) TransactionOption {
 	}
 }
 
+// WithInit is an option that makes the transaction fulfill the --init-required condition before the chaincode
+// can be invoked to process regular transactions
+func WithInit() TransactionOption {
+	return func(txn *Transaction) error {
+		txn.isInit = true
+		return nil
+	}
+}
+
 // Evaluate a transaction function and return its results.
 // The transaction function will be evaluated on the endorsing peers but
 // the responses will not be sent to the ordering service and hence will
@@ -124,6 +134,7 @@ func (txn *Transaction) Submit(args ...string) ([]byte, error) {
 		bytes[i] = []byte(v)
 	}
 	txn.request.Args = bytes
+	txn.request.IsInit = txn.isInit
 
 	var options []channel.RequestOption
 	if txn.endorsingPeers != nil {

pkg/gateway/transaction_test.go

@@ -80,6 +80,57 @@ func TestTransactionOptions(t *testing.T) {
 	txn.Submit("arg1", "arg2")
 }
 
+func TestInitTransactionOptions(t *testing.T) {
+	transient := make(map[string][]byte)
+	transient["price"] = []byte("8500")
+
+	c := mockChannelProvider("mychannel")
+
+	gw := &Gateway{
+		options: &gatewayOptions{
+			Timeout: defaultTimeout,
+		},
+	}
+
+	nw, err := newNetwork(gw, c)
+
+	if err != nil {
+		t.Fatalf("Failed to create network: %s", err)
+	}
+
+	contr := nw.GetContract("contract1")
+
+	txn, err := contr.CreateTransaction(
+		"txn1",
+		WithTransient(transient),
+		WithEndorsingPeers("peer1"),
+		WithCollections("_implicit_org_org1"),
+		WithInit(),
+	)
+
+	if err != nil {
+		t.Fatalf("Failed to create transaction: %s", err)
+	}
+
+	data := txn.request.TransientMap["price"]
+	if string(data) != "8500" {
+		t.Fatalf("Incorrect transient data: %s", string(data))
+	}
+
+	endorsers := txn.endorsingPeers
+	if endorsers[0] != "peer1" {
+		t.Fatalf("Incorrect endorsing peer: %s", endorsers[0])
+	}
+
+	collections := txn.collections
+	if collections[0] != "_implicit_org_org1" {
+		t.Fatalf("Incorrect collection: %s", collections[0])
+	}
+
+	txn.Evaluate("arg1", "arg2")
+	txn.Submit("arg1", "arg2")
+}
+
 func TestCommitEvent(t *testing.T) {
 	c := mockChannelProvider("mychannel")