Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(connector-fabric-socketio): migrate to fabric-all-in-one from fabric14-fabcar-testnet #1754

Merged
merged 3 commits into from
Jan 18, 2022
Merged

refactor(connector-fabric-socketio): migrate to fabric-all-in-one from fabric14-fabcar-testnet #1754

merged 3 commits into from
Jan 18, 2022

Conversation

outSH
Copy link
Contributor

@outSH outSH commented Jan 11, 2022 •
edited by petermetz
Loading

- Remove obsolete 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 michal.bajer@fujitsu.com

Please note that I'll work on containerizing fabric-socketio validator and cartrade sample, for this reason I didn't put too much effort in documenting changes from this commit (since most of it will change very soon).
Also, docker startup scripts will probably be replaced by sample-specific docker-compose.

Depends on #1696

@outSH outSH force-pushed the fabric_validator_fix_pr branch from ba9963e to 372924c Compare January 11, 2022 11:18
@outSH
Copy link
Contributor Author

outSH commented Jan 11, 2022

Depends on #1696

@outSH
Copy link
Contributor Author

outSH commented Jan 11, 2022

@izuru0 @takeutak @petermetz
Please review

@outSH outSH force-pushed the fabric_validator_fix_pr branch from 372924c to 1895afb Compare January 11, 2022 14:45
@petermetz
Copy link
Contributor

@outSH Are the files in the ./tools/docker/fabric-all-in-one/fabcar-cli-1.4/ directory a copy paste of the ones in the fabric samples repo?

@outSH
Copy link
Contributor Author

outSH commented Jan 12, 2022

Are the files in the ./tools/docker/fabric-all-in-one/fabcar-cli-1.4/ directory a copy paste of the ones in the fabric samples repo?

@petermetz No, I described this in README in this dir, I've done some minor changes to access connection info from local directory, also changed formatting a little

petermetz
petermetz approved these changes Jan 13, 2022
View reviewed changes
Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the files in the ./tools/docker/fabric-all-in-one/fabcar-cli-1.4/ directory a copy paste of the ones in the fabric samples repo?

@petermetz No, I described this in README in this dir, I've done some minor changes to access connection info from local directory, also changed formatting a little

@outSH Would it make sense to contribute those minor changes back to the fabric sample repo and then use it from there instead?

@petermetz petermetz requested review from izuru0 and takeutak and removed request for jonathan-m-hamilton January 13, 2022 19:44
@petermetz
Copy link
Contributor

petermetz commented Jan 13, 2022 •
edited
Loading

Depends on #1696

@outSH Unfortunately the robot only sees this syntax when it's placed in the PR description, not in the comments afterwards. (I edited the PR description just now so that the robot sees it)

It's a silly little detail, but actually quite important because the robot keeps us from accidentally merging this PR before the other one (which if we do, the other PR will have to be closed down without being merged)

@petermetz petermetz added dependencies Pull requests that update a dependency file Developer_Experience labels Jan 13, 2022
@outSH
Copy link
Contributor Author

outSH commented Jan 14, 2022

Would it make sense to contribute those minor changes back to the fabric sample repo and then use it from there instead?

Well, hard-coded path could be replaced with argument (or adjustable by env variable), and although it doesn't seem relevant in any way to fabric-samples itself, I think it could pass, but I'll think about it later - right now I'm working on putting cartrade in a container, and will possibly introduce some changes to these scripts in follow-up commit.

Unfortunately the robot only sees this syntax when it's placed in the PR description, not in the comments afterwards. (I edited the PR description just now so that the robot sees it)

Didn't know that, thanks! I will put the dependencies in PR description from now on :)

@outSH outSH force-pushed the fabric_validator_fix_pr branch from 1895afb to eac8443 Compare January 14, 2022 12:23
@github-actions
Copy link

This PR/issue depends on:

izuru0
izuru0 approved these changes Jan 17, 2022
View reviewed changes
Copy link
Contributor

@izuru0 izuru0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@outSH outSH mentioned this pull request Jan 17, 2022
Closed
@outSH
refactor(connector-fabric-socketio): migrate to fabric-all-in-one fro…
b6ae085 
…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>
@outSH outSH force-pushed the fabric_validator_fix_pr branch from eac8443 to b6ae085 Compare January 17, 2022 15:05
@petermetz petermetz removed the request for review from takeutak January 17, 2022 20:59
@petermetz petermetz merged commit 334593a into hyperledger-cacti:main Jan 18, 2022
@petermetz
Copy link
Contributor

Would it make sense to contribute those minor changes back to the fabric sample repo and then use it from there instead?

Well, hard-coded path could be replaced with argument (or adjustable by env variable), and although it doesn't seem relevant in any way to fabric-samples itself, I think it could pass, but I'll think about it later - right now I'm working on putting cartrade in a container, and will possibly introduce some changes to these scripts in follow-up commit.

@outSH Sounds good to me, thanks again!

@petermetz petermetz mentioned this pull request Jan 19, 2022
Closed
outSH added a commit to outSH/cactus that referenced this pull request Jan 20, 2022
@outSH
fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…
67fbb63 
…srsasign

Revert fabric sdk package change from PR hyperledger-cacti#1754

Closes: hyperledger-cacti#1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
@outSH outSH mentioned this pull request Jan 20, 2022
Merged
outSH added a commit to outSH/cactus that referenced this pull request Jan 20, 2022
@outSH
fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…
b3e87f3 
…srsasign

Revert fabric sdk package change from PR hyperledger-cacti#1754

Closes: hyperledger-cacti#1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
outSH added a commit to outSH/cactus that referenced this pull request Jan 20, 2022
@outSH
fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…
13a7d30 
…srsasign

Revert fabric sdk package change from PR hyperledger-cacti#1754

Closes: hyperledger-cacti#1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
outSH added a commit to outSH/cactus that referenced this pull request Jan 20, 2022
@outSH
fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…
9126eb3 
…srsasign

Revert fabric sdk package change from PR hyperledger-cacti#1754

Closes: hyperledger-cacti#1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
outSH added a commit to outSH/cactus that referenced this pull request Jan 31, 2022
@outSH
fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…
67b6ac8 
…srsasign

Revert fabric sdk package change from PR hyperledger-cacti#1754

Closes: hyperledger-cacti#1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
petermetz pushed a commit to outSH/cactus that referenced this pull request Feb 3, 2022
@outSH @petermetz
fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…
cc06aa9 
…srsasign

Revert fabric sdk package change from PR hyperledger-cacti#1754

Closes: hyperledger-cacti#1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
outSH added a commit to outSH/cactus that referenced this pull request Feb 4, 2022
@outSH
fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…
9dbadf6 
…srsasign

Revert fabric sdk package change from PR hyperledger-cacti#1754

Closes: hyperledger-cacti#1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
petermetz pushed a commit that referenced this pull request Feb 4, 2022
@outSH @petermetz
fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…
a9ecb19 
…srsasign

Revert fabric sdk package change from PR #1754

Closes: #1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
@outSH outSH deleted the fabric_validator_fix_pr branch March 21, 2022 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@izuru0 izuru0 izuru0 approved these changes

@petermetz petermetz petermetz approved these changes

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file Developer_Experience
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use only fabric-all-in-one image, remove reduntant fabric testnets
3 participants
@outSH @petermetz @izuru0