Skip to content

Commit adc1600

Browse files
christo4ferrisghaskins
authored andcommitted
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 <[email protected]> Signed-off-by: Greg Haskins <[email protected]>
1 parent 0370ada commit adc1600

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

core/rest/rest_api.json

+3-9
Original file line numberDiff line numberDiff line change
@@ -451,15 +451,9 @@
451451
"type": "object",
452452
"properties": {
453453
"type": {
454-
"type": "string",
455-
"default": "GOLANG",
456-
"example": "GOLANG",
457-
"enum":[
458-
"UNDEFINED",
459-
"GOLANG",
460-
"NODE",
461-
"JAVA"
462-
],
454+
"type": "integer",
455+
"default": 1,
456+
"example": 1,
463457
"description": "Chaincode specification language."
464458
},
465459
"chaincodeID": {

docs/API/CoreAPI.md

+6-12
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ POST host:port/chaincode
227227
"path":"github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02"
228228
},
229229
"ctorMsg": {
230-
"function":"init",
231-
"args":["a", "1000", "b", "2000"]
230+
"args":["init", "a", "1000", "b", "2000"]
232231
}
233232
},
234233
"id": 1
@@ -251,8 +250,7 @@ POST host:port/chaincode
251250
"path":"github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02"
252251
},
253252
"ctorMsg": {
254-
"function":"init",
255-
"args":["a", "1000", "b", "2000"]
253+
"args":["init", "a", "1000", "b", "2000"]
256254
},
257255
"secureContext": "lukas"
258256
},
@@ -289,8 +287,7 @@ Chaincode Invocation Request without security enabled:
289287
"name":"52b0d803fc395b5e34d8d4a7cd69fb6aa00099b8fabed83504ac1c5d61a425aca5b3ad3bf96643ea4fdaac132c417c37b00f88fa800de7ece387d008a76d3586"
290288
},
291289
"ctorMsg": {
292-
"function":"invoke",
293-
"args":["a", "b", "100"]
290+
"args":["invoke", "a", "b", "100"]
294291
}
295292
},
296293
"id": 3
@@ -311,8 +308,7 @@ Chaincode Invocation Request with security enabled (add `secureContext` element)
311308
"name":"52b0d803fc395b5e34d8d4a7cd69fb6aa00099b8fabed83504ac1c5d61a425aca5b3ad3bf96643ea4fdaac132c417c37b00f88fa800de7ece387d008a76d3586"
312309
},
313310
"ctorMsg": {
314-
"function":"invoke",
315-
"args":["a", "b", "100"]
311+
"args":["invoke", "a", "b", "100"]
316312
},
317313
"secureContext": "lukas"
318314
},
@@ -349,8 +345,7 @@ Chaincode Query Request without security enabled:
349345
"name":"52b0d803fc395b5e34d8d4a7cd69fb6aa00099b8fabed83504ac1c5d61a425aca5b3ad3bf96643ea4fdaac132c417c37b00f88fa800de7ece387d008a76d3586"
350346
},
351347
"ctorMsg": {
352-
"function":"query",
353-
"args":["a"]
348+
"args":["query", "a"]
354349
}
355350
},
356351
"id": 5
@@ -371,8 +366,7 @@ Chaincode Query Request with security enabled (add `secureContext` element):
371366
"name":"52b0d803fc395b5e34d8d4a7cd69fb6aa00099b8fabed83504ac1c5d61a425aca5b3ad3bf96643ea4fdaac132c417c37b00f88fa800de7ece387d008a76d3586"
372367
},
373368
"ctorMsg": {
374-
"function":"query",
375-
"args":["a"]
369+
"args":["query", "a"]
376370
},
377371
"secureContext": "lukas"
378372
},

0 commit comments

Comments
 (0)