refactor: always set ics27 ports regardless of whether the capability exists #4640
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
… exists Add e2e to test integration points. Refactor persisted port state to be separate from port binding/creation
3 tasks
colin-axner
commented
Sep 12, 2023
There was a problem hiding this comment.
copy/pasted from ics27 tests
colin-axner
commented
Sep 12, 2023
| @@ -62,7 +62,8 @@ func (k Keeper) registerInterchainAccount(ctx sdk.Context, connectionID, portID, | |||
| case k.portKeeper.IsBound(ctx, portID) && !k.hasCapability(ctx, portID): | |||
| return "", errorsmod.Wrapf(icatypes.ErrPortAlreadyBound, "another module has claimed capability for and bound port with portID: %s", portID) | |||
| case !k.portKeeper.IsBound(ctx, portID): | |||
| capability := k.BindPort(ctx, portID) | |||
| k.setPort(ctx, portID) | |||
There was a problem hiding this comment.
ideally gets removed #4638 in the future
colin-axner
commented
Sep 12, 2023
| @@ -123,19 +122,20 @@ func NewAppModule(controllerKeeper *controllerkeeper.Keeper, hostKeeper *hostkee | |||
| // called once and as an alternative to InitGenesis. | |||
| func (am AppModule) InitModule(ctx sdk.Context, controllerParams controllertypes.Params, hostParams hosttypes.Params) { | |||
damiannolan
approved these changes
Sep 13, 2023
There was a problem hiding this comment.
Awesome, thank you @colin-axner! ❤️
Hopefully we can address these issues sooner rather than later :)
colin-axner
commented
Sep 13, 2023
Comment on lines
86
to
94
| for _, port := range ports { | ||
| store := suite.chainA.GetContext().KVStore(suite.chainA.GetSimApp().GetKey(icacontrollertypes.StoreKey)) | ||
| suite.Require().True(store.Has(icatypes.KeyPort(port))) | ||
|
|
||
| capability, found := suite.chainA.GetSimApp().ScopedICAControllerKeeper.GetCapability(suite.chainA.GetContext(), host.PortPath(port)) | ||
| suite.Require().True(found) | ||
| suite.Require().NotNil(capability) | ||
| } | ||
| }) |
There was a problem hiding this comment.
this is the main thing added
colin-axner
commented
Sep 13, 2023
| icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" | ||
| host "github.com/cosmos/ibc-go/v8/modules/core/24-host" | ||
| ibctesting "github.com/cosmos/ibc-go/v8/testing" | ||
| ) | ||
|
|
||
| func (suite *KeeperTestSuite) TestInitGenesis() { |
There was a problem hiding this comment.
it's really hard to test both setups of capabilities already being initialized or not being initialized as the testing pkg will call init genesis first and the portID is hard coded. I personally think this sort of integration testing is better handled by the e2e's which is why I added coverage there
colin-axner
requested review from
AdityaSripal,
crodriguezvega,
charleenfei,
chatton and
DimitrisJim
as code owners
…c-go into colin/4626-ica-initgenesis-fix
damiannolan
reviewed
Sep 13, 2023
| @@ -5,11 +5,29 @@ import ( | |||
| "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types" | |||
| genesistypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/genesis/types" | |||
| icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" | |||
| host "github.com/cosmos/ibc-go/v8/modules/core/24-host" | |||
| ibctesting "github.com/cosmos/ibc-go/v8/testing" | |||
| ) | |||
|
|
|||
| func (suite *KeeperTestSuite) TestInitGenesis() { | |||
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #4640 +/- ##
==========================================
+ Coverage 79.53% 79.56% +0.03%
==========================================
Files 188 188
Lines 13191 13201 +10
==========================================
+ Hits 10492 10504 +12
+ Misses 2267 2266 -1
+ Partials 432 431 -1
|
…relayer support across genesis retarts
colin-axner
commented
Sep 13, 2023
e2e/tests/upgrades/genesis_test.go
Outdated
| @@ -180,17 +180,6 @@ func (s *GenesisTestSuite) TestIBCGenesis() { | |||
|
|
|||
| s.Require().NoError(test.WaitForBlocks(ctx, 10, chainA, chainB)) | |||
| }) | |||
|
|
|||
| t.Run("verify tokens transferred", func(t *testing.T) { | |||
There was a problem hiding this comment.
this should be added with #3476
chatton
approved these changes
Sep 14, 2023
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.
Description
Need to update genesis unit tests
closes: #4626
Commit Message / Changelog Entry
see the guidelines for commit messages. (view raw markdown for examples)
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.
docs/) or specification (x/<module>/spec/).godoccomments.Files changedin the Github PR explorer.Codecov Reportin the comment section below once CI passes.