Use new port router for OnChanUpgradeInit #7082
Merged
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
chatton
changed the title
chatton
commented
Aug 7, 2024
| @@ -118,22 +118,6 @@ func (im *LegacyIBCModule) OnChanOpenTry( | |||
| return reconstructVersion(im.cbs, negotiatedVersions) | |||
| } | |||
|
|
|||
| // reconstructVersion will generate the channel version by applying any version wrapping as necessary. | |||
| // Version wrapping will only occur if the negotiated version is non=empty and the application is a VersionWrapper. | |||
| func reconstructVersion(cbs []ClassicIBCModule, negotiatedVersions []string) (string, error) { | |||
There was a problem hiding this comment.
I just moved this to the bottom of the file since most handlers are not using this.
chatton
requested review from
colin-axner,
AdityaSripal,
damiannolan and
srdtrk
as code owners
colin-axner
reviewed
Aug 7, 2024
|
|
||
| return cbs.OnChanUpgradeInit(ctx, portID, channelID, proposedOrder, proposedConnectionHops, proposedVersion) | ||
| func (IBCMiddleware) OnChanUpgradeInit(ctx sdk.Context, portID, channelID string, proposedOrder channeltypes.Order, proposedConnectionHops []string, proposedVersion string) (string, error) { | ||
| return proposedVersion, nil |
There was a problem hiding this comment.
Suggested change
| return proposedVersion, nil | |
| return "", nil |
to be explicit?
colin-axner
approved these changes
Aug 7, 2024
damiannolan
approved these changes
Aug 8, 2024
| } | ||
| return cbs.OnChanUpgradeInit(ctx, portID, channelID, proposedOrder, proposedConnectionHops, proposedVersion) | ||
| } | ||
|
|
||
| return proposedVersion, nil |
There was a problem hiding this comment.
I think we can return im.keeper.OnChanUpgradeInit() ?
chatton
deleted the
cian/issue#7026-use-new-port-router-for-onchanupgradeinit
branch
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
This PR updates the OnChanUpgradeInit implementations.
Note; The assumption exists that all callbacks in a stack must implement the optional
UpgradeModuleinterface. This logic was moved into the LegacyIBCModule implementation instead of checking the underlyingim.apps.closes: #7026
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/).godoccomments.Files changedin the GitHub PR explorer.SonarCloud Reportin the comment section below once CI passes.