From 340b4c950d6c336b7863e726e5c8f2d6f724f603 Mon Sep 17 00:00:00 2001 From: Michal Bajer Date: Tue, 11 Jan 2022 11:49:44 +0100 Subject: [PATCH] refactor(connector-fabric-socketio): migrate to fabric-all-in-one from fabric14-fabcar-testnet Remove obsolete fabric fabric14-fabcar-testnet fabric14-testnet, use only fabric-all-in-one for all purposes for all test / sample app purposes. Add helper scripts from fabric-sample that are used during cartrade setup phase (I've decided it's better to keep them in repo than increasing the size of fabric-all-in-one image). Upgrade of fabcar network (from 1.4.1 to 1.4.8) triggered multiple changes in fabric-socketio validator, since fabcar nodes (peers, orderer) use TLS and require different setup, additionaly done some refactors and fixes in the validator. Update the cartrade and discounted-cartrade sample apps to work with the new setup, refreshed scripts can be used to ease up the setup process. Closes: #1753 Signed-off-by: Michal Bajer Signed-off-by: aldousalvarez --- .../script-test-getFunctions/fabric/package.json | 10 ---------- examples/discounted-cartrade/package.json | 6 ++++++ .../script-test-getFunctions/fabric/package.json | 10 ---------- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 examples/cartrade/script-test-getFunctions/fabric/package.json delete mode 100644 examples/discounted-cartrade/script-test-getFunctions/fabric/package.json diff --git a/examples/cartrade/script-test-getFunctions/fabric/package.json b/examples/cartrade/script-test-getFunctions/fabric/package.json deleted file mode 100644 index bc50d4f3fcd..00000000000 --- a/examples/cartrade/script-test-getFunctions/fabric/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "validatorDriver", - "version": "0.0.0", - "private": true, - "dependencies": { - "config": "^1.26.1", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10" - } -} \ No newline at end of file diff --git a/examples/discounted-cartrade/package.json b/examples/discounted-cartrade/package.json index 8d951c5ee36..7b62373f7fb 100644 --- a/examples/discounted-cartrade/package.json +++ b/examples/discounted-cartrade/package.json @@ -20,6 +20,7 @@ "ethereumjs-common": "^1.5.1", "ethereumjs-tx": "^2.1.2", "express": "~4.16.1", +<<<<<<< HEAD <<<<<<< HEAD "fabric-ca-client": "~1.4.0", "fabric-network": "~1.4.0", @@ -29,6 +30,11 @@ "fabric-network": "2.2.10", "fabric-client": "^1.4.0", >>>>>>> build(socket.io, socket.io-client): upgrade to common socket +======= + "fabric-ca-client": "~1.4.0", + "fabric-network": "~1.4.0", + "fabric-client": "~1.4.0", +>>>>>>> refactor(connector-fabric-socketio): migrate to fabric-all-in-one from fabric14-fabcar-testnet "http-errors": "~1.6.3", "indy-sdk": "^1.16.0-dev-1636", "jsonwebtoken": "^8.5.1", diff --git a/examples/discounted-cartrade/script-test-getFunctions/fabric/package.json b/examples/discounted-cartrade/script-test-getFunctions/fabric/package.json deleted file mode 100644 index bc50d4f3fcd..00000000000 --- a/examples/discounted-cartrade/script-test-getFunctions/fabric/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "validatorDriver", - "version": "0.0.0", - "private": true, - "dependencies": { - "config": "^1.26.1", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10" - } -} \ No newline at end of file