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.

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

Chan.Part.API: join system channel using config block IT #2082

Merged
merged 3 commits into from
Nov 9, 2020

Conversation

wlahti
Copy link
Contributor

@wlahti wlahti commented Nov 6, 2020

Type of change

  • Test update

Description

First commit:

  • Use the configtx library to create the system channel genesis block, as it provides an easy way in tests for explicit control over the orderer endpoints and consenters for a channel.

Second commit:

  • join system channel using config block IT

Third commit:

  • submitTxn IT helper cleanup to remove functions parameters that are no longer used

Related issues

FAB-18273

@wlahti wlahti requested a review from a team as a code owner November 6, 2020 15:32
@wlahti wlahti changed the title Fab 18273 Chan.Part.API: join system channel using config block IT Nov 6, 2020
integration/raft/channel_participation_test.go Outdated Show resolved Hide resolved
integration/raft/channel_participation_test.go Outdated Show resolved Hide resolved
@@ -968,6 +1096,80 @@ func applicationChannelGenesisBlock(n *nwo.Network, orderers []*nwo.Orderer, p *
return genesisBlock
}

func systemChannelGenesisBlock(n *nwo.Network, orderers []*nwo.Orderer, peers []*nwo.Peer, channel string) *common.Block {
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems to be duplication of the existing logic for bootstrapping a network. Did you look at simply re-using what's already present via nwo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The key difference is the flexibility of including different orderers in the consenters set without having a different configtx.yaml (or template). By default, nwo includes all orderers in the consenters set and the endpoints.

Use the configtx library to create the system channel genesis block,
as it provides an easy way in tests for explicit control over the
orderer endpoints and consenters for a channel.

FAB-18273

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
FAB-18273

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
These were used previously but not any longer and should be removed.

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
@jyellick jyellick merged commit 73853ef into hyperledger:master Nov 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants