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

Two TMS on the same fabric network #476

Merged
merged 4 commits into from
Jul 11, 2023
Merged

Two TMS on the same fabric network #476

merged 4 commits into from
Jul 11, 2023

Conversation

adecaro
Copy link
Contributor

@adecaro adecaro commented Jul 5, 2023

This PR introduces a new integration test that checks that two different TMS can leave in the same Fabric channel.

alexandrosfilios and others added 2 commits July 7, 2023 09:43
Integration tests for basic view operations with two chaincodes belonging to two different organizations

Signed-off-by: Alexandros Filios <[email protected]>

Removed flag -mod=mod

Removed redundant flag for go build

Signed-off-by: Alexandros Filios <[email protected]>

Removed flag -mod=mod

Removed redundant flag for go build

Signed-off-by: Alexandros Filios <[email protected]>

cleanup

Signed-off-by: Angelo De Caro <[email protected]>

Removed flag -mod=mod

Removed redundant flag for go build

Signed-off-by: Alexandros Filios <[email protected]>

Removed flag -mod=mod

Removed redundant flag for go build

Signed-off-by: Alexandros Filios <[email protected]>

Removed flag -mod=mod

Removed redundant flag for go build

Signed-off-by: Alexandros Filios <[email protected]>

Removed flag -mod=mod

Removed redundant flag for go build

Signed-off-by: Alexandros Filios <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
@adecaro adecaro changed the title two TMS on the same fabric network Two TMS on the same fabric network Jul 7, 2023
@adecaro adecaro added the testing label Jul 7, 2023
@@ -86,6 +86,7 @@ jobs:
tests: [
dlog-fabric-t1,
dlog-fabric-t2,
mixed,
Copy link
Member

Choose a reason for hiding this comment

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

can we give this a name with a bit more context?

Copy link
Member

Choose a reason for hiding this comment

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

if we come back to this test later it might be unclear what is mixed here :)

Copy link
Member

Choose a reason for hiding this comment

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

maybe dlog-fabtoken-mixed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good point, will do

Comment on lines +157 to +166
dlogTms := tokenTopology.AddTMS([]*node.Node{issuer1, auditor1, alice, bob}, backendNetwork, backendChannel, DLogDriver)
dlogTms.SetNamespace(DLogNamespace)
// max token value is 100^2 - 1 = 9999
dlogTms.SetTokenGenPublicParams("100", "2")
fabric2.SetOrgs(dlogTms, "Org1")

fabTokenTms := tokenTopology.AddTMS([]*node.Node{issuer2, auditor2, alice, bob}, backendNetwork, backendChannel, FabtokenDriver)
fabTokenTms.SetNamespace(FabTokenNamespace)
fabTokenTms.SetTokenGenPublicParams("9998")
fabric2.SetOrgs(fabTokenTms, "Org2")
Copy link
Member

Choose a reason for hiding this comment

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

@adecaro do you think it would make sense here to refactor this topology so we can re-use the view configuration in multiple integration tests?

I would assume that most of the views we are attaching to alice, bob, and co are the same. This would allow us to highlight better the actual configuration change in this topo, namely, adding two TMSs ... Maybe this could be handled in a separate PR. WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good point, indeed. Let's open a git issue and address this :)

Copy link
Member

Choose a reason for hiding this comment

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

created issue #483

Signed-off-by: Angelo De Caro <[email protected]>
@mbrandenburger
Copy link
Member

@adecaro Thanks for addressing my comments. I suggest that you squash the commits and cleanup commit messages :)

@adecaro
Copy link
Contributor Author

adecaro commented Jul 11, 2023

@mbrandenburger , I can squash directly when merging. No need to delay :)

@adecaro adecaro merged commit 647d2db into main Jul 11, 2023
@adecaro adecaro deleted the mixed-chaincode-test branch July 11, 2023 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants