-
Notifications
You must be signed in to change notification settings - Fork 586
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
Use new port router for OnChanUpgradeAck #7094
Merged
chatton
merged 5 commits into
feat/port-router
from
cian/issue#7028-use-new-port-router-for-onchanupgradeack
Aug 8, 2024
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9a178d8
chore: implement OnChanUpgradeTry
chatton 616c3f6
wip: partial implementation for OnChanUpgradeAck
chatton b0ab410
Merge branch 'feat/port-router' into cian/issue#7028-use-new-port-rou…
chatton 592eecf
chore: updated tests to work with new OnChanUpgradeAck implementation
chatton de41517
Merge branch 'feat/port-router' into cian/issue#7028-use-new-port-rou…
chatton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1285,70 +1285,6 @@ func (suite *KeeperTestSuite) TestChannelUpgradeAck() { | |
ibctesting.AssertEvents(&suite.Suite, expEvents, events) | ||
}, | ||
}, | ||
{ | ||
"application callback returns error and error receipt is written", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. no more underlying app |
||
func() { | ||
suite.chainA.GetSimApp().IBCMockModule.IBCApp.OnChanUpgradeAck = func( | ||
ctx sdk.Context, portID, channelID, counterpartyVersion string, | ||
) error { | ||
// set arbitrary value in store to mock application state changes | ||
store := ctx.KVStore(suite.chainA.GetSimApp().GetKey(exported.ModuleName)) | ||
store.Set([]byte("foo"), []byte("bar")) | ||
return fmt.Errorf("mock app callback failed") | ||
} | ||
}, | ||
func(res *channeltypes.MsgChannelUpgradeAckResponse, events []abci.Event, err error) { | ||
suite.Require().NoError(err) | ||
|
||
suite.Require().NotNil(res) | ||
suite.Require().Equal(channeltypes.FAILURE, res.Result) | ||
|
||
errorReceipt, found := suite.chainA.GetSimApp().GetIBCKeeper().ChannelKeeper.GetUpgradeErrorReceipt(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID) | ||
suite.Require().True(found) | ||
suite.Require().Equal(uint64(1), errorReceipt.Sequence) | ||
|
||
// assert application state changes are not committed | ||
store := suite.chainA.GetContext().KVStore(suite.chainA.GetSimApp().GetKey(exported.ModuleName)) | ||
suite.Require().False(store.Has([]byte("foo"))) | ||
|
||
channel := path.EndpointB.GetChannel() | ||
expEvents := sdk.Events{ | ||
sdk.NewEvent( | ||
channeltypes.EventTypeChannelUpgradeError, | ||
sdk.NewAttribute(channeltypes.AttributeKeyPortID, path.EndpointA.ChannelConfig.PortID), | ||
sdk.NewAttribute(channeltypes.AttributeKeyChannelID, path.EndpointA.ChannelID), | ||
sdk.NewAttribute(channeltypes.AttributeCounterpartyPortID, path.EndpointB.ChannelConfig.PortID), | ||
sdk.NewAttribute(channeltypes.AttributeCounterpartyChannelID, path.EndpointB.ChannelID), | ||
sdk.NewAttribute(channeltypes.AttributeKeyUpgradeSequence, fmt.Sprintf("%d", channel.UpgradeSequence)), | ||
// need to manually insert this because the errorReceipt is a string constant as it is written into state | ||
sdk.NewAttribute(channeltypes.AttributeKeyErrorReceipt, "mock app callback failed"), | ||
), | ||
sdk.NewEvent( | ||
sdk.EventTypeMessage, | ||
sdk.NewAttribute(sdk.AttributeKeyModule, channeltypes.AttributeValueCategory), | ||
), | ||
}.ToABCIEvents() | ||
ibctesting.AssertEvents(&suite.Suite, expEvents, events) | ||
}, | ||
}, | ||
{ | ||
"ibc application does not implement the UpgradeableModule interface", | ||
func() { | ||
path = ibctesting.NewPath(suite.chainA, suite.chainB) | ||
path.EndpointA.ChannelConfig.PortID = ibcmock.MockBlockUpgrade | ||
path.EndpointB.ChannelConfig.PortID = ibcmock.MockBlockUpgrade | ||
|
||
path.Setup() | ||
|
||
msg.PortId = path.EndpointA.ChannelConfig.PortID | ||
msg.ChannelId = path.EndpointA.ChannelID | ||
}, | ||
func(res *channeltypes.MsgChannelUpgradeAckResponse, events []abci.Event, err error) { | ||
suite.Require().ErrorIs(err, porttypes.ErrInvalidRoute) | ||
suite.Require().Nil(res) | ||
suite.Require().Empty(events) | ||
}, | ||
}, | ||
{ | ||
"application callback returns an upgrade error", | ||
func() { | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same as OnChanUpgradeTry except the negotiatedVersions array was removed.