[FAB-9851] Remove constructor in favor of literal

- Remove constructor in favor of explicit dependency injection from
  ChaincodeSupport to the handler instance.
- Add some documentation comments and group fields in Handler
- Change state to int based enum so zero value matches default state of
  created
- Rename getCCRootName to chaincodeName to more accurately reflect what
  is returned

Change-Id: I56aa4245be5d1f465b50842b1e92b9b53eff0303
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

core/chaincode/chaincode_suite_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/ledger"
+	pb "github.com/hyperledger/fabric/protos/peer"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
@@ -79,6 +80,6 @@ type chaincodeStream interface {
 
 // Helpers to access unexported state.
 
-func SetHandlerTxContexts(h *Handler, txContexts *TransactionContexts) {
-	h.txContexts = txContexts
+func SetHandlerChaincodeID(h *Handler, chaincodeID *pb.ChaincodeID) {
+	h.chaincodeID = chaincodeID
 }

core/chaincode/chaincode_support.go

@@ -128,7 +128,22 @@ func (cs *ChaincodeSupport) Stop(ctx context.Context, cccid *ccprovider.CCContex
 
 // HandleChaincodeStream implements ccintf.HandleChaincodeStream for all vms to call with appropriate stream
 func (cs *ChaincodeSupport) HandleChaincodeStream(ctxt context.Context, stream ccintf.ChaincodeStream) error {
-	return HandleChaincodeStream(cs, ctxt, stream)
+	deadline, ok := ctxt.Deadline()
+	chaincodeLogger.Debugf("Current context deadline = %s, ok = %v", deadline, ok)
+
+	handler := &Handler{
+		Executor:           cs,
+		Lifecycle:          &Lifecycle{Executor: cs},
+		Keepalive:          cs.Keepalive,
+		Registry:           cs.HandlerRegistry,
+		ACLProvider:        cs.ACLProvider,
+		TXContexts:         NewTransactionContexts(),
+		ActiveTransactions: NewActiveTransactions(),
+
+		sccp: cs.sccp,
+	}
+
+	return handler.ProcessStream(stream)
 }
 
 // Register the bidi stream entry point called by chaincode to register with the Peer.
@@ -151,7 +166,7 @@ func createCCMessage(messageType pb.ChaincodeMessage_Type, cid string, txid stri
 	return ccmsg, nil
 }
 
-//Execute - execute proposal, return original response of chaincode
+// Execute - execute proposal, return original response of chaincode
 func (cs *ChaincodeSupport) Execute(ctxt context.Context, cccid *ccprovider.CCContext, spec ccprovider.ChaincodeSpecGetter) (*pb.Response, *pb.ChaincodeEvent, error) {
 	var cctyp pb.ChaincodeMessage_Type
 	switch spec.(type) {

core/chaincode/chaincode_support_test.go

@@ -1088,7 +1088,7 @@ func TestStartAndWaitLaunchError(t *testing.T) {
 }
 
 func TestGetTxContextFromHandler(t *testing.T) {
-	h := Handler{txContexts: NewTransactionContexts(), sccp: &scc.Provider{Peer: peer.Default, PeerSupport: peer.DefaultSupport, Registrar: inproccontroller.NewRegistry()}}
+	h := Handler{TXContexts: NewTransactionContexts(), sccp: &scc.Provider{Peer: peer.Default, PeerSupport: peer.DefaultSupport, Registrar: inproccontroller.NewRegistry()}}
 
 	chnl := "test"
 	txid := "1"
@@ -1190,7 +1190,7 @@ func genNewPldAndCtxFromLdgr(t *testing.T, ccName string, chnl string, txid stri
 	// get a context for this txsim
 	ctxt := context.WithValue(context.Background(), TXSimulatorKey, txsim)
 	// create a new txContext in the handler to be retrieved by the tested function (ie: getTxContextForInvoke)
-	newTxCtxt, err := h.txContexts.Create(ctxt, chnl, txid, nil, nil)
+	newTxCtxt, err := h.TXContexts.Create(ctxt, chnl, txid, nil, nil)
 	if err != nil {
 		t.Fatalf("Error creating TxContext by the handler for cc %s and channel '%s': %s", ccName, chnl, err)
 	}
@@ -1300,7 +1300,7 @@ func TestCCFramework(t *testing.T) {
 	initializeCC(t, chainID, ccname, ccSide, chaincodeSupport)
 
 	//chaincode support should not allow dups
-	handler := &Handler{ChaincodeID: &pb.ChaincodeID{Name: ccname + ":0"}, sccp: chaincodeSupport.sccp}
+	handler := &Handler{chaincodeID: &pb.ChaincodeID{Name: ccname + ":0"}, sccp: chaincodeSupport.sccp}
 	if err := chaincodeSupport.HandlerRegistry.Register(handler); err == nil {
 		t.Fatalf("expected re-register to fail")
 	}