FAB-11029 Make stop take container info

Yet another step to remove the chaincode deployment spec dependencies
from the chaincode package.

Change-Id: I4db64faff97da097e6ab6713394c1ba18539faf3
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

core/chaincode/ccproviderimpl.go

@@ -57,6 +57,6 @@ func (c *CCProviderImpl) ExecuteInit(ctxt context.Context, cccid *ccprovider.CCC
 }
 
 // Stop stops the chaincode given context and spec
-func (c *CCProviderImpl) Stop(cccid *ccprovider.CCContext, spec *pb.ChaincodeDeploymentSpec) error {
- return c.cs.Stop(cccid, spec)
+func (c *CCProviderImpl) Stop(ccci *ccprovider.ChaincodeContainerInfo) error {
+ return c.cs.Stop(ccci)
 }

core/chaincode/chaincode_support.go

@@ -150,12 +150,7 @@ func (cs *ChaincodeSupport) Launch(cccid *ccprovider.CCContext, spec *pb.Chainco
 }
 
 // Stop stops a chaincode if running.
-func (cs *ChaincodeSupport) Stop(cccid *ccprovider.CCContext, cds *pb.ChaincodeDeploymentSpec) error {
- cname := cccid.GetCanonicalName()
- defer cs.HandlerRegistry.Deregister(cname)
-
- ccci := ccprovider.DeploymentSpecToChaincodeContainerInfo(cds)
- ccci.Version = cccid.Version
+func (cs *ChaincodeSupport) Stop(ccci *ccprovider.ChaincodeContainerInfo) error {
  err := cs.Runtime.Stop(ccci)
  if err != nil {
  return err

core/chaincode/concurrency_test.go

@@ -47,7 +47,14 @@ func TestExecuteConcurrentInvokes(t *testing.T) {
 
  cccid := ccprovider.NewCCContext(chainID, "nkpi", "0", "", false, nil, nil)
 
- defer chaincodeSupport.Stop(cccid, &pb.ChaincodeDeploymentSpec{ChaincodeSpec: spec})
+ ccci := &ccprovider.ChaincodeContainerInfo{
+ Type: "GOLANG",
+ Name: "nkpi",
+ Version: "0",
+ Path: url,
+ ContainerType: "DOCKER",
+ }
+ defer chaincodeSupport.Stop(ccci)
 
  var nextBlockNumber uint64
  _, err = deploy(ctxt, cccid, spec, nextBlockNumber, chaincodeSupport)