Skip to content

Commit

Permalink
refactor(connector-fabric-socketio): migrate to fabric-all-in-one fro…
Browse files Browse the repository at this point in the history
…m 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: hyperledger-cacti#1753
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
Signed-off-by: aldousalvarez <aldousss.alvarez@gmail.com>
  • Loading branch information
outSH authored and aldousalvarez committed Jan 19, 2022
1 parent e6a666b commit 340b4c9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 20 deletions.
10 changes: 0 additions & 10 deletions examples/cartrade/script-test-getFunctions/fabric/package.json

This file was deleted.

6 changes: 6 additions & 0 deletions examples/discounted-cartrade/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down

This file was deleted.

0 comments on commit 340b4c9

Please sign in to comment.