-
Notifications
You must be signed in to change notification settings - Fork 516
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FABN-1532 NodeSDK allow for non-TLS networks (#198)
Update the fabric-network parsing of a common connection profile to handle a non-TLS network. Provide testing. Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
- Loading branch information
Showing
14 changed files
with
227 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
test/ts-fixtures/chaincode/node/fabcar/metadata/collections.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| [ | ||
| { | ||
| "name": "collectionFabcar", | ||
| "policy": "OR('Org1MSP.member', 'Org2MSP.member')", | ||
| "requiredPeerCount": 0, | ||
| "maxPeerCount": 3, | ||
| "blockToLive":1000000, | ||
| "memberOnlyRead": true, | ||
| "memberOnlyWrite": true | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
|
|
||
| @gateway_nontls | ||
| @gateway | ||
| @fabric_merge | ||
| Feature: Configure Fabric using CLI and submit/evaluate using a network Gateway without discovery | ||
|
|
||
| Background: | ||
| Given I place a scenario start message GATEWAY NON TLS FEATURE | ||
| Given I deploy a non-tls Fabric network at 2.0 version | ||
| And I use the cli to create and join the channel named gatewaychannel on the deployed network | ||
| And I use the cli to update the channel with name gatewaychannel with config file gatewaychannel-anchor.tx on the deployed network | ||
| And I use the cli to lifecycle deploy a node smart contract named fabcar at version 1.0.0 as fabcar for all organizations on channel gatewaychannel with default endorsement policy and init-required false | ||
| And I have a couchDB backed gateway named mynontlsgateway with discovery set to false for user User1 using the connection profile named ccp.json | ||
|
|
||
| Scenario: Using a Gateway I can submit and evaluate transactions on instantiated node smart contract | ||
| When I use the gateway named mynontlsgateway to submit a transaction with args [createCar,1001,Trabant,601 Estate,brown,Simon] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a submit type response | ||
| When I use the gateway named mynontlsgateway to evaluate a transaction with args [queryCar,1001] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a evaluate type response matching {"color":"brown","docType":"car","make":"Trabant","model":"601 Estate","owner":"Simon"} | ||
|
|
||
| Scenario: Using a Gateway I recieve useful error messages when I submit or evaulate invalid transactions | ||
| When I use the gateway named mynontlsgateway to submit a transaction with args [noSuchSubmitTransaction,1001,Trabant,601 Estate,brown,Simon] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a error type response containing Error: You've asked to invoke a function that does not exist: noSuchSubmitTransaction | ||
| When I use the gateway named mynontlsgateway to submit a transaction with args [createCar,9,Ford] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a error type response containing Error: Expected 5 parameters, but 2 have been supplied | ||
| When I use the gateway named mynontlsgateway to evaluate a transaction with args [noSuchEvaluateTransaction,1001] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a error type response containing Error: You've asked to invoke a function that does not exist: noSuchEvaluateTransaction | ||
| When I use the gateway named mynontlsgateway to evaluate a transaction with args [queryCar,because,I,said,so] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a error type response containing Error: Expected 1 parameters, but 4 have been supplied | ||
|
|
||
| Scenario: Using a Gateway to submit transactions I can use different event handler strategies | ||
| When I modify mynontlsgateway to submit a transaction with args [createCar,1002,Ford,Mustang,Silver,Andy] for contract fabcar instantiated on channel gatewaychannel using handler option MSPID_SCOPE_ALLFORTX | ||
| And I use the gateway named mynontlsgateway to evaluate a transaction with args [queryCar,1002] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a evaluate type response matching {"color":"Silver","docType":"car","make":"Ford","model":"Mustang","owner":"Andy"} | ||
| When I modify mynontlsgateway to submit a transaction with args [createCar,1003,Ford,Fiesta,Blue,Heather] for contract fabcar instantiated on channel gatewaychannel using handler option MSPID_SCOPE_ANYFORTX | ||
| And I use the gateway named mynontlsgateway to evaluate a transaction with args [queryCar,1003] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a evaluate type response matching {"color":"Blue","docType":"car","make":"Ford","model":"Fiesta","owner":"Heather"} | ||
| When I modify mynontlsgateway to submit a transaction with args [createCar,1004,Vauxhall,Corsa,White,Mark] for contract fabcar instantiated on channel gatewaychannel using handler option NETWORK_SCOPE_ALLFORTX | ||
| And I use the gateway named mynontlsgateway to evaluate a transaction with args [queryCar,1004] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a evaluate type response matching {"color":"White","docType":"car","make":"Vauxhall","model":"Corsa","owner":"Mark"} | ||
| When I modify mynontlsgateway to submit a transaction with args [createCar,1005,Bugatti,Veyron,Black,Bret] for contract fabcar instantiated on channel gatewaychannel using handler option NETWORK_SCOPE_ANYFORTX | ||
| Then The gateway named mynontlsgateway has a submit type response | ||
| When I modify mynontlsgateway to submit a transaction with args [createCar,1006,Lotus,Elise,Pink,Nick] for contract fabcar instantiated on channel gatewaychannel using handler option custom | ||
| And I use the gateway named mynontlsgateway to evaluate a transaction with args [queryCar,1006] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a evaluate type response matching {"color":"Pink","docType":"car","make":"Lotus","model":"Elise","owner":"Nick"} | ||
|
|
||
| Scenario: Using a Gateway I can use transient data | ||
| When I modify mynontlsgateway to submit a transaction with transient data using args [getTransient,value1,value2] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a submit type response matching {"key0":"value1","key1":"value2"} | ||
| When I modify mynontlsgateway to evaluate a transaction with transient data using args [getTransient,valueA,valueB] for contract fabcar instantiated on channel gatewaychannel | ||
| Then The gateway named mynontlsgateway has a evaluate type response matching {"key0":"valueA","key1":"valueB"} | ||
|
|
||
| Scenario: Using a Gateway to evaluate transactions I can use different query handler strategies | ||
| When I modify mynontlsgateway to evaluate a transaction with args [queryCar,1001] for contract fabcar instantiated on channel gatewaychannel using handler option MSPID_SCOPE_SINGLE | ||
| Then The gateway named mynontlsgateway has a evaluate type response matching {"color":"brown","docType":"car","make":"Trabant","model":"601 Estate","owner":"Simon"} | ||
| When I modify mynontlsgateway to evaluate a transaction with args [queryCar,1001] for contract fabcar instantiated on channel gatewaychannel using handler option MSPID_SCOPE_ROUND_ROBIN | ||
| Then The gateway named mynontlsgateway has a evaluate type response matching {"color":"brown","docType":"car","make":"Trabant","model":"601 Estate","owner":"Simon"} | ||
| When I modify mynontlsgateway to evaluate a transaction with args [queryCar,1001] for contract fabcar instantiated on channel gatewaychannel using handler option custom | ||
| Then The gateway named mynontlsgateway has a evaluate type response matching {"color":"brown","docType":"car","make":"Trabant","model":"601 Estate","owner":"Simon"} |
Oops, something went wrong.