Multi-consumer capable e2e tests #475

shaspitz · 2022-11-12T05:09:31Z

This PR replicates the e2e test setup that we've previously used for a single consumer, and allows that setup to be done on multiple consumers.

In order to prove out functionality, I've improved TestRelayAndApplySlashPacket in this PR to incorporate multiple consumers. Note that future work can change all/some of the remaining e2e tests to consider multiple consumers, see #506

shaspitz · 2022-11-15T21:25:39Z

tests/e2e/setup.go

-		addr1 := utils.GetChangePubKeyAddress(providerValUpdates[i])
-		addr2 := utils.GetChangePubKeyAddress(consumerValUpdates[i])
-		suite.Require().True(bytes.Equal(addr1, addr2), "validator mismatch")
+		suite.providerApp, suite.consumerBundles = suite.setupCallback(suite.T())


If done correctly, none of the following code should change how setup is done. It should merely add for-loops to setup all consumers in the exact same way we previously setup a single consumer

shaspitz · 2022-11-15T21:26:50Z

tests/e2e/setup.go

-	suite.transferPath.EndpointB.ChannelConfig.PortID = transfertypes.PortID
-	suite.transferPath.EndpointA.ChannelConfig.Version = transfertypes.Version
-	suite.transferPath.EndpointB.ChannelConfig.Version = transfertypes.Version
+	// Support tests that were written before multiple consumers were supported.


This is important to make existing single-consumer tests act in the same way as before. As stated above, we could eventually remove these fields in favor of accessing consumer state only through their "bundle"

shaspitz · 2022-11-15T21:28:09Z

tests/e2e/unbonding.go

@@ -304,8 +304,10 @@ func (s *CCVTestSuite) TestUnbondingNoConsumer() {
 	providerKeeper := s.providerApp.GetProviderKeeper()
 	providerStakingKeeper := s.providerApp.GetE2eStakingKeeper()

-	// remove the consumer chain, which was already registered during setup
-	providerKeeper.DeleteConsumerClientId(s.providerCtx(), s.consumerChain.ChainID)
+	// remove all consumer chains, which were already registered during setup


In order for onHold to be false below, we need to delete all client IDs established with the provider

shaspitz · 2022-11-15T21:31:30Z

testutil/ibc_testing/generic_setup.go

 )

+// ConsumerBundle serves as a way to store useful in-mem consumer app chain state
+// and relevant IBC paths in the context of CCV e2e testing.
+type ConsumerBundle struct {


Lmk if there's anyway to make this abstraction more generic, or named in a better way. It's pretty much "all the state associated with each consumer that you need for e2e tests"

shaspitz · 2022-11-21T19:38:37Z

tests/e2e/slashing.go

 		s.SetupTest()
-		s.SetupCCVChannel()
-		s.SetupTransferChannel()


This previous call to s.SetupTransferChannel() was unnecessary and is not included in the new diff

shaspitz · 2022-11-21T19:39:43Z

tests/e2e/slashing.go


-		err = s.path.EndpointB.UpdateClient()


This call to UpdateClient was unnecessary and is not included in new diff

shaspitz · 2022-11-21T20:05:04Z

tests/e2e/setup.go

-	skippedTests  map[string]bool
+
+	// The first consumer chain among multiple.
+	consumerChain *ibctesting.TestChain


We can eventually remove these fields in favor of accessing all this state via consumerBundles below. However, this will require large diffs, and is not feasible to do in a single PR

danwt

Nice work!

commit 7fbbc76 Merge: e772dfb 095a076 Author: Marius Poke <[email protected]> Date: Fri Nov 25 12:04:15 2022 +0100 Merge branch 'main' into marius/key-assignment commit e772dfb Author: mpoke <[email protected]> Date: Fri Nov 25 11:47:25 2022 +0100 fix address conversion commit 095a076 Author: Shawn Marshall-Spitzbart <[email protected]> Date: Wed Nov 23 11:12:48 2022 -0800 Multi-consumer capable e2e tests (#475) * changes * mas * Update README.md * Update README.md * sorry for the friday night emails * Update instance_test.go * wip * wip * wip * wip * wip * wip * wip * wip * works * Update generic_setup.go * Update setup.go * smol * small * path to ccv chan setup * todos * Update setup.go * Create debug_test.go * democ * Update debug_test.go * setup all ccv channels * bump to main * another bump, missed one * fix after merge main * fixes * Update slashing.go * expired client tests * checks * fixed the stuff * smol * changes * updates * cleans * clean * todo * fixes * cleans * Update slashing.go * Update slashing.go Co-authored-by: Jehan <[email protected]>

commit aca9578 Author: mpoke <[email protected]> Date: Fri Nov 25 14:50:45 2022 +0100 fix linter commit 6d8cd10 Author: mpoke <[email protected]> Date: Fri Nov 25 14:46:11 2022 +0100 adding e2e tests commit 7fbbc76 Merge: e772dfb 095a076 Author: Marius Poke <[email protected]> Date: Fri Nov 25 12:04:15 2022 +0100 Merge branch 'main' into marius/key-assignment commit e772dfb Author: mpoke <[email protected]> Date: Fri Nov 25 11:47:25 2022 +0100 fix address conversion commit 095a076 Author: Shawn Marshall-Spitzbart <[email protected]> Date: Wed Nov 23 11:12:48 2022 -0800 Multi-consumer capable e2e tests (#475) * changes * mas * Update README.md * Update README.md * sorry for the friday night emails * Update instance_test.go * wip * wip * wip * wip * wip * wip * wip * wip * works * Update generic_setup.go * Update setup.go * smol * small * path to ccv chan setup * todos * Update setup.go * Create debug_test.go * democ * Update debug_test.go * setup all ccv channels * bump to main * another bump, missed one * fix after merge main * fixes * Update slashing.go * expired client tests * checks * fixed the stuff * smol * changes * updates * cleans * clean * todo * fixes * cleans * Update slashing.go * Update slashing.go Co-authored-by: Jehan <[email protected]>

shaspitz added 8 commits November 11, 2022 09:50

changes

0475032

Merge branch 'main' into testutil-refactor

3af89d1

mas

8a55b0a

Update README.md

b83d8cb

Update README.md

3c5c817

sorry for the friday night emails

69596b6

Update instance_test.go

e7cde9e

wip

71bf63b

shaspitz changed the base branch from main to testutil-refactor November 12, 2022 05:10

shaspitz added 9 commits November 14, 2022 19:34

wip

0b924ac

wip

226aa95

wip

5f6952e

wip

b64fece

wip

bc577e0

wip

48a8772

wip

a4b755b

works

9f45d14

Update generic_setup.go

b51510d

Base automatically changed from testutil-refactor to main November 15, 2022 20:05

shaspitz mentioned this pull request Nov 15, 2022

difftest-core: setup refactorings #477

Closed

shaspitz added 3 commits November 15, 2022 13:07

Merge branch 'main' into e2e-multiple-consumers

8dca707

Update setup.go

7dcce36

smol

ec469f1

shaspitz commented Nov 15, 2022

View reviewed changes

shaspitz added 3 commits November 15, 2022 13:34

small

dd8983d

path to ccv chan setup

714be77

todos

49b45f2

shaspitz added 2 commits November 21, 2022 10:43

Merge branch 'mapped-sent-packets-fix' into e2e-multiple-consumers

c476872

updates

aba6ccc

shaspitz changed the base branch from main to mapped-sent-packets-fix November 21, 2022 18:52

shaspitz added 4 commits November 21, 2022 10:58

cleans

1598b5b

clean

7d2e39a

todo

71463e0

fixes

c1a9926

shaspitz commented Nov 21, 2022

View reviewed changes

shaspitz mentioned this pull request Nov 21, 2022

Refactor more integration tests to consider multiple consumers #506

Closed

2 tasks

cleans

9587b4c

shaspitz commented Nov 21, 2022

View reviewed changes

shaspitz added 2 commits November 21, 2022 12:39

Update slashing.go

3b81eb2

Update slashing.go

7c85833

Base automatically changed from mapped-sent-packets-fix to main November 22, 2022 12:16

Merge branch 'main' into e2e-multiple-consumers

68cfe9f

shaspitz marked this pull request as ready for review November 22, 2022 16:46

shaspitz requested review from jtremback, mpoke, sainoe and danwt as code owners November 22, 2022 16:46

shaspitz requested a review from MSalopek November 22, 2022 16:47

Merge branch 'main' into e2e-multiple-consumers

9f2236f

danwt approved these changes Nov 22, 2022

View reviewed changes

Merge branch 'main' into e2e-multiple-consumers

1010813

jtremback approved these changes Nov 23, 2022

View reviewed changes

jtremback merged commit 095a076 into main Nov 23, 2022

jtremback deleted the e2e-multiple-consumers branch November 23, 2022 19:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multi-consumer capable e2e tests #475

Multi-consumer capable e2e tests #475

shaspitz commented Nov 12, 2022 •

edited

Loading

shaspitz Nov 15, 2022

shaspitz Nov 15, 2022 •

edited

Loading

shaspitz Nov 15, 2022 •

edited

Loading

shaspitz Nov 15, 2022 •

edited

Loading

shaspitz Nov 21, 2022 •

edited

Loading

shaspitz Nov 21, 2022 •

edited

Loading

shaspitz Nov 21, 2022

danwt left a comment

Multi-consumer capable e2e tests #475

Multi-consumer capable e2e tests #475

Conversation

shaspitz commented Nov 12, 2022 • edited Loading

shaspitz Nov 15, 2022

Choose a reason for hiding this comment

shaspitz Nov 15, 2022 • edited Loading

Choose a reason for hiding this comment

shaspitz Nov 15, 2022 • edited Loading

Choose a reason for hiding this comment

shaspitz Nov 15, 2022 • edited Loading

Choose a reason for hiding this comment

shaspitz Nov 21, 2022 • edited Loading

Choose a reason for hiding this comment

shaspitz Nov 21, 2022 • edited Loading

Choose a reason for hiding this comment

shaspitz Nov 21, 2022

Choose a reason for hiding this comment

danwt left a comment

Choose a reason for hiding this comment

shaspitz commented Nov 12, 2022 •

edited

Loading

shaspitz Nov 15, 2022 •

edited

Loading

shaspitz Nov 15, 2022 •

edited

Loading

shaspitz Nov 15, 2022 •

edited

Loading

shaspitz Nov 21, 2022 •

edited

Loading

shaspitz Nov 21, 2022 •

edited

Loading