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

e2e: v8.1 upgrade test for capital efficient escrows #5652

Merged
merged 17 commits into from
Jan 22, 2024

Conversation

damiannolan
Copy link
Member

Description

closes: #5635


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against the correct branch (see CONTRIBUTING.md).
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the module structure standards and Go style guide.
  • Wrote unit and integration tests.
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/).
  • Added relevant godoc comments.
  • Provide a commit message to be used for the changelog entry in the PR description for review.
  • Re-reviewed Files changed in the Github PR explorer.
  • Review Codecov Report in the comment section below once CI passes.

@damiannolan damiannolan changed the title e2e: v8.1 upgrade test e2e: v8.1 upgrade test for capital efficient escrows Jan 18, 2024
@@ -59,8 +62,12 @@ func (s *UpgradeTestSuite) UpgradeChain(ctx context.Context, chain *cosmos.Cosmo
Info: fmt.Sprintf("upgrade version test from %s to %s", currentVersion, upgradeVersion),
}

upgradeProposal := upgradetypes.NewSoftwareUpgradeProposal(fmt.Sprintf("upgrade from %s to %s", currentVersion, upgradeVersion), "upgrade chain E2E test", plan)
s.ExecuteAndPassGovV1Beta1Proposal(ctx, chain, wallet, upgradeProposal)
Copy link
Member Author

Choose a reason for hiding this comment

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

curious when it's possible to completely switch over and remove this

Copy link
Contributor

Choose a reason for hiding this comment

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

That would be once v7 reaches end of life, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think so, but I'm basing it just off one of the feature releases matrices in values.go

e2e/tests/upgrades/upgrade_test.go Outdated Show resolved Hide resolved
e2e/tests/upgrades/upgrade_test.go Show resolved Hide resolved
@damiannolan damiannolan added e2e priority PRs that need prompt reviews labels Jan 19, 2024
@@ -12,20 +12,6 @@ on:


jobs:
upgrade-v5-hermes:
Copy link
Member Author

Choose a reason for hiding this comment

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

EOL btw, so removed both hermes and rly tests

e2e/tests/upgrades/upgrade_test.go Outdated Show resolved Hide resolved
e2e/testsuite/testconfig.go Outdated Show resolved Hide resolved
@@ -399,6 +400,22 @@ func (*E2ETestSuite) TransferChannelOptions() func(options *ibc.CreateChannelOpt
}
}

// FeeMiddlewareChannelOptions configures both of the chains to have fee middleware enabled.
func (s *E2ETestSuite) FeeMiddlewareChannelOptions() func(options *ibc.CreateChannelOptions) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I took the liberty to move this function here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you @crodriguezvega!

Copy link
Contributor

@crodriguezvega crodriguezvega left a comment

Choose a reason for hiding this comment

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

Great work! I pushed some changes to address a couple of review comments, and the tests still pass, so giving my approval now.

Copy link
Contributor

@chatton chatton left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you for some of the workflow cleanup and sorting out the channel params genesis issue ❤️

return nil, err
}

// be ashamed, be very ashamed
Copy link
Contributor

Choose a reason for hiding this comment

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

❤️

This is not actually the worst thing ATM, I think we can improve this, but this ended up being very readable and concise compared to the other options we were playing with.

Copy link
Member Author

Choose a reason for hiding this comment

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

yea, agree! let's leave in the comment for comical effect I guess, would be nice to not have to add a new func for every field we need to sanitise, but we can think about that later - string splitting on a jsonPath with "." is a bit gross but I'm not sure I have any better ideas atm!

@damiannolan damiannolan enabled auto-merge (squash) January 22, 2024 13:53
@damiannolan damiannolan merged commit 40564ed into main Jan 22, 2024
108 of 109 checks passed
@damiannolan damiannolan deleted the damian/5635-add-e2e-upgrade-test branch January 22, 2024 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
e2e priority PRs that need prompt reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add upgrade handler and e2e upgrade test for ics29 capital efficient escrows
4 participants