Fix noop chaincode argument handling

As currently (for backward compatibility) the 0th
element of args is passed as a function, Noop
chaincode needs to threat this is its only argument.

Change-Id: I5049db0210502355a3f11154e4bfaf04f9b2b17b
Signed-off-by: Gabor Hosszu <[email protected]>

Author: gaborh-da

bddtests/syschaincode/noop/chaincode.go

@@ -59,7 +59,7 @@ func (t *SystemChaincode) Init(stub shim.ChaincodeStubInterface, function string
 
 // Invoke runs an invocation on the system chaincode
 func (t *SystemChaincode) Invoke(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
-	if len(args) != 1 {
+	if len(args) != 0 || function == "" {
 		return nil, errors.New("Noop execute operation must have one single argument.")
 	}
 	logger.Infof("Executing noop invoke.")

bddtests/syschaincode/noop/chaincode_test.go

@@ -47,23 +47,23 @@ func TestInvokeUnsupported(t *testing.T) {
 
 func TestInvokeExecuteNotEnoughArgs(t *testing.T) {
 	var noop = SystemChaincode{mockLedger{}}
-	var res, err = noop.Invoke(nil, "execute", []string{})
+	var res, err = noop.Invoke(nil, "", []string{})
 	if res != nil || err == nil {
 		t.Errorf("Invoke.execute has to indicate error if called with less than one arguments!")
 	}
 }
 
 func TestInvokeExecuteOneArgReturnsNothing(t *testing.T) {
 	var noop = SystemChaincode{mockLedger{}}
-	var res, err = noop.Invoke(nil, "execute", []string{"arg1"})
+	var res, err = noop.Invoke(nil, "transaction", []string{})
 	if res != nil || err != nil {
 		t.Errorf("Invoke.execute has to return nil with no error.")
 	}
 }
 
 func TestInvokeExecuteMoreArgsReturnsError(t *testing.T) {
 	var noop = SystemChaincode{mockLedger{}}
-	var res, err = noop.Invoke(nil, "execute", []string{"arg1", "arg2"})
+	var res, err = noop.Invoke(nil, "transaction", []string{"arg1"})
 	if res != nil || err == nil {
 		t.Errorf("Invoke.execute has to return error when called with more than one arguments.")
 	}