Fix FAB-578

Fix FAB-578 incorrect chaincode signature in REST API fix rest_api.json NB: Cherry-picked from a96b9ed after reverting inadvertent merge of master - GMH Change-Id: I852de103d902d5630f27b43a8057e0ee82f1b020 Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com> Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>
hyperledger · Oct 3, 2016 · adc1600 · adc1600
1 parent 0370ada
commit adc1600
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/core/rest/rest_api.json b/core/rest/rest_api.json
@@ -451,15 +451,9 @@
             "type": "object",
             "properties": {
                 "type": {
-                    "type": "string",
-                    "default": "GOLANG",
-                    "example": "GOLANG",
-                    "enum":[
-                        "UNDEFINED",
-                        "GOLANG",
-                        "NODE",
-                        "JAVA"
-                    ],
+                    "type": "integer",
+                    "default": 1,
+                    "example": 1,
                     "description": "Chaincode specification language."
                 },
                 "chaincodeID": {

diff --git a/docs/API/CoreAPI.md b/docs/API/CoreAPI.md
@@ -227,8 +227,7 @@ POST host:port/chaincode
         "path":"github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02"
     },
     "ctorMsg": {
-        "function":"init",
-        "args":["a", "1000", "b", "2000"]
+        "args":["init", "a", "1000", "b", "2000"]
     }
   },
   "id": 1
@@ -251,8 +250,7 @@ POST host:port/chaincode
         "path":"github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02"
     },
     "ctorMsg": {
-        "function":"init",
-        "args":["a", "1000", "b", "2000"]
+        "args":["init", "a", "1000", "b", "2000"]
     },
     "secureContext": "lukas"
   },
@@ -289,8 +287,7 @@ Chaincode Invocation Request without security enabled:
           "name":"52b0d803fc395b5e34d8d4a7cd69fb6aa00099b8fabed83504ac1c5d61a425aca5b3ad3bf96643ea4fdaac132c417c37b00f88fa800de7ece387d008a76d3586"
       },
       "ctorMsg": {
-         "function":"invoke",
-         "args":["a", "b", "100"]
+         "args":["invoke", "a", "b", "100"]
       }
   },
   "id": 3
@@ -311,8 +308,7 @@ Chaincode Invocation Request with security enabled (add `secureContext` element)
           "name":"52b0d803fc395b5e34d8d4a7cd69fb6aa00099b8fabed83504ac1c5d61a425aca5b3ad3bf96643ea4fdaac132c417c37b00f88fa800de7ece387d008a76d3586"
       },
       "ctorMsg": {
-         "function":"invoke",
-         "args":["a", "b", "100"]
+         "args":["invoke", "a", "b", "100"]
       },
       "secureContext": "lukas"
   },
@@ -349,8 +345,7 @@ Chaincode Query Request without security enabled:
           "name":"52b0d803fc395b5e34d8d4a7cd69fb6aa00099b8fabed83504ac1c5d61a425aca5b3ad3bf96643ea4fdaac132c417c37b00f88fa800de7ece387d008a76d3586"
       },
       "ctorMsg": {
-         "function":"query",
-         "args":["a"]
+         "args":["query", "a"]
       }
   },
   "id": 5
@@ -371,8 +366,7 @@ Chaincode Query Request with security enabled (add `secureContext` element):
           "name":"52b0d803fc395b5e34d8d4a7cd69fb6aa00099b8fabed83504ac1c5d61a425aca5b3ad3bf96643ea4fdaac132c417c37b00f88fa800de7ece387d008a76d3586"
       },
       "ctorMsg": {
-         "function":"query",
-         "args":["a"]
+         "args":["query", "a"]
       },
       "secureContext": "lukas"
   },