Upgrade to version3 #497
Open
Upgrade to version3 #497
Conversation
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
Signed-off-by: Sanket Teli <[email protected]>
Signed-off-by: Sanket Teli <[email protected]>
Signed-off-by: Sanket Teli <[email protected]>
Signed-off-by: Sanket Teli <[email protected]>
Signed-off-by: Sanket Teli <[email protected]>
Signed-off-by: Sanket <[email protected]>
Signed-off-by: Sanket <[email protected]>
dzikowski
reviewed
Nov 26, 2024
| { | ||
| "groupName": "group1", | ||
| "type": "raft", | ||
| "instances": 1 |
There was a problem hiding this comment.
please add at least 3 raft nodes, and also verify them in logs (we need to be sure all raft nodes are able to support the channel)
| @@ -213,20 +213,15 @@ export default class SetupDockerGenerator extends Generator { | |||
| } | |||
|
|
|||
| _copyUtilityScripts(capabilities: Capabilities): void { | |||
| this.fs.copyTpl(this.templatePath("fabric-docker.sh"), this.destinationPath("fabric-docker.sh")); | |||
| this.fs.copyTpl(this.templatePath(`fabric-docker.sh`), this.destinationPath("fabric-docker.sh")); | |||
There was a problem hiding this comment.
Suggested change
| this.fs.copyTpl(this.templatePath(`fabric-docker.sh`), this.destinationPath("fabric-docker.sh")); | |
| this.fs.copyTpl(this.templatePath("fabric-docker.sh"), this.destinationPath("fabric-docker.sh")); |
Comment on lines
-20
to
+24
| FABRIC_JAVAENV_VERSION=<%= global.fabricJavaenvVersion %> | ||
| FABRIC_NODEENV_VERSION=<%= global.fabricNodeenvVersion %> | ||
| RECOMMENDED_NODE_VERSION=<%= global.fabricRecommendedNodeVersion %> | ||
|
|
||
|
|
||
| FABRIC_JAVAENV_VERSION=3.0-beta | ||
| FABRIC_NODEENV_VERSION=2.5 | ||
| RECOMMENDED_NODE_VERSION=18 |
There was a problem hiding this comment.
should be taken from global.
Comment on lines
+49
to
+80
| <% } else if (global.capabilities.isV3) { -%> | ||
| <% channels.forEach((channel) => { -%> | ||
| <% channel.orgs.forEach((org, orgNo) => { -%> | ||
| <% org.peers.forEach((peer, peerNo) => { -%> | ||
| <% if (orgNo == 0 && peerNo == 0) { -%> | ||
| printHeadline "Creating '<%= channel.name %>' on <%= org.name %>/<%= peer.name %>" "U1F63B" | ||
| <% if (!global.tls) { -%> | ||
| docker exec -i <%= org.cli.address %> bash -c <% -%> | ||
| "source scripts/channel_fns.sh; createChannelAndJoin '<%= channel.name %>' '<%= org.mspName %>' '<%= peer.fullAddress %>' 'crypto/users/Admin@<%= org.domain %>/msp' '<%= channel.ordererHead.address %>:<%= channel.ordererHead.adminPort %>';" | ||
| sleep 5 | ||
| docker exec -i <%= org.cli.address %> bash -c <% -%> | ||
| "source scripts/channel_fns.sh; fetchChannelAndJoin '<%= channel.name %>' '<%= org.mspName %>' '<%= peer.fullAddress %>' 'crypto/users/Admin@<%= org.domain %>/msp' '<%= channel.ordererHead.fullAddress %>';" | ||
| <% } else { -%> | ||
| docker exec -i <%= org.cli.address %> bash -c <% -%> | ||
| "source scripts/channel_fns.sh; createChannelAndJoinTls '<%= channel.name %>' '<%= org.mspName %>' '<%= peer.fullAddress %>' 'crypto/users/Admin@<%= org.domain %>/msp' 'crypto/users/Admin@<%= org.domain %>/tls' 'crypto-orderer/tlsca.<%= channel.ordererHead.domain %>-cert.pem' '<%= channel.ordererHead.address %>:<%= channel.ordererHead.adminPort %>';" | ||
| sleep 5 | ||
| docker exec -i <%= org.cli.address %> bash -c <% -%> | ||
| "source scripts/channel_fns.sh; fetchChannelAndJoinTls '<%= channel.name %>' '<%= org.mspName %>' '<%= peer.fullAddress %>' 'crypto/users/Admin@<%= org.domain %>/msp' 'crypto/users/Admin@<%= org.domain %>/tls' 'crypto-orderer/tlsca.<%= channel.ordererHead.domain %>-cert.pem' '<%= channel.ordererHead.fullAddress %>';" | ||
| <% } %> | ||
| <% } else { -%> | ||
| printItalics "Joining '<%= channel.name %>' on <%= org.name %>/<%= peer.name %>" "U1F638" | ||
| <% if (!global.tls) { -%> | ||
| docker exec -i <%= org.cli.address %> bash -c <% -%> | ||
| "source scripts/channel_fns.sh; fetchChannelAndJoin '<%= channel.name %>' '<%= org.mspName %>' '<%= peer.fullAddress %>' 'crypto/users/Admin@<%= org.domain %>/msp' '<%= channel.ordererHead.fullAddress %>';" | ||
| <% } else { -%> | ||
| docker exec -i <%= org.cli.address %> bash -c <% -%> | ||
| "source scripts/channel_fns.sh; fetchChannelAndJoinTls '<%= channel.name %>' '<%= org.mspName %>' '<%= peer.fullAddress %>' 'crypto/users/Admin@<%= org.domain %>/msp' 'crypto/users/Admin@<%= org.domain %>/tls' 'crypto-orderer/tlsca.<%= channel.ordererHead.domain %>-cert.pem' '<%= channel.ordererHead.fullAddress %>';" | ||
| <% } -%> | ||
| <% } -%> | ||
| <% }) -%> | ||
| <% }) -%> | ||
| <% }) -%> |
There was a problem hiding this comment.
I believe it misses our changes with multiple orderers
Comment on lines
-79
to
-86
| <% if (global.capabilities.isV2) { -%> | ||
| <% if (global.peerDevMode) { -%> | ||
| <%- include('commands-generated/chaincode-dev-v2.sh', { chaincode }); -%> | ||
| <% } else { -%> | ||
| local version="<%= chaincode.version %>" | ||
| <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); -%> | ||
| <% } -%> | ||
| <% } -%> |
There was a problem hiding this comment.
you can decrease identation
Comment on lines
188
to
190
| printHeadline "Creating new channel config blocks" "U1F537" | ||
| <% channels.forEach((channel) => { -%> | ||
| <% channel.orgs.forEach((org) => { -%> |
There was a problem hiding this comment.
please keep consistent indentation (increase)
Comment on lines
+229
to
+231
| <% } else { %> | ||
| echo "" | ||
| <% } %> |
|
|
||
|
|
There was a problem hiding this comment.
please remove any duplicated lines
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have successfully added the support for version 3, Right now the templates are updated and I am working over updating the test for version 3. Will update the tests in the next commit and it will be ready for merging.