Skip to content

Commit

Permalink
Merge "[FAB-4112] Remove legacy code"
Browse files Browse the repository at this point in the history
  • Loading branch information
C0rWin authored and Gerrit Code Review committed May 25, 2017
2 parents 6e0ec1f + 5180a08 commit b7841b5
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions core/chaincode/exectransaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,11 @@ func Execute(ctxt context.Context, cccid *ccprovider.CCContext, spec interface{}
cctyp = pb.ChaincodeMessage_TRANSACTION
}

cID, cMsg, err := theChaincodeSupport.Launch(ctxt, cccid, spec)
_, cMsg, err := theChaincodeSupport.Launch(ctxt, cccid, spec)
if err != nil {
return nil, nil, fmt.Errorf("%s", err)
}

//this should work because it worked above...
chaincode := cID.Name

if err != nil {
return nil, nil, fmt.Errorf("Failed to stablish stream to container %s", chaincode)
}

if err != nil {
return nil, nil, fmt.Errorf("Failed to retrieve chaincode spec(%s)", err)
}

var ccMsg *pb.ChaincodeMessage
ccMsg, err = createCCMessage(cctyp, cccid.TxID, cMsg)
if err != nil {
Expand Down

0 comments on commit b7841b5

Please sign in to comment.