-
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
Make AbortUpgrade panic on failure #4011
Merged
crodriguezvega
merged 6 commits into
04-channel-upgrades
from
cian/issue#3903-AbortUpgrade-returns-an-error-despite-being-an-non-failure-action
Jul 6, 2023
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b06ac7d
chore: update abort upgrade function to panic on error
chatton 2f3e2b3
Merge branch '04-channel-upgrades' into cian/issue#3903-AbortUpgrade-…
chatton 5b5d60b
Merge branch '04-channel-upgrades' into cian/issue#3903-AbortUpgrade-…
chatton 488a050
Merge branch '04-channel-upgrades' into cian/issue#3903-AbortUpgrade-…
chatton d4022a4
apply review suggestions
crodriguezvega cb7575c
Merge branch '04-channel-upgrades' into cian/issue#3903-AbortUpgrade-…
crodriguezvega 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1305,10 +1305,10 @@ func (suite *KeeperTestSuite) TestAbortHandshake() { | |
|
||
tc.malleate() | ||
|
||
err := channelKeeper.AbortUpgrade(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, upgradeError) | ||
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. guess we could also define the function as a var and trim down on the |
||
|
||
if tc.expPass { | ||
suite.Require().NoError(err) | ||
suite.Require().NotPanics(func() { | ||
channelKeeper.MustAbortUpgrade(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, upgradeError) | ||
}) | ||
|
||
channel, found := channelKeeper.GetChannel(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID) | ||
suite.Require().True(found, "channel should be found") | ||
|
@@ -1329,7 +1329,11 @@ func (suite *KeeperTestSuite) TestAbortHandshake() { | |
suite.Require().False(found, "counterparty last packet sequence should not be found") | ||
|
||
} else { | ||
suite.Require().Error(err) | ||
|
||
suite.Require().Panics(func() { | ||
channelKeeper.MustAbortUpgrade(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, upgradeError) | ||
}) | ||
|
||
channel, found := channelKeeper.GetChannel(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID) | ||
if found { // test cases uses a channel that exists | ||
suite.Require().Equal(types.INITUPGRADE, channel.State, "channel state should not be restored to %s", types.INITUPGRADE.String()) | ||
|
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
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.
do we see
abortUpgrade
ever being used w/o panicking, i.e point in keeping it separate?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.
I don't think so. I left it here as I typically like having panics happen in a single place. I find it easier to deal with regular errors as much as possible, and panic only when we need to.