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

minor channel fixes #8665

Merged
merged 10 commits into from
Mar 1, 2021
Merged

minor channel fixes #8665

merged 10 commits into from
Mar 1, 2021

Conversation

damiannolan
Copy link
Member

Description

  • Consolidating codec.go registrations.
  • Moving Acknowledgement result/error to its own file

Completes the remaining items detailed in #7949. First issue so hoping process is covered here.
Running make proto-all has also performed regen on markdown docs.

closes: #7949


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 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.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer
  • Review Codecov Report in the comment section below once CI passes

@codecov
Copy link

codecov bot commented Feb 22, 2021

Codecov Report

Merging #8665 (cb00cbb) into master (3832860) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8665      +/-   ##
==========================================
- Coverage   61.39%   61.39%   -0.01%     
==========================================
  Files         671      672       +1     
  Lines       38352    38343       -9     
==========================================
- Hits        23548    23539       -9     
  Misses      12336    12336              
  Partials     2468     2468              
Impacted Files Coverage Δ
x/ibc/core/04-channel/types/channel.go 77.55% <ø> (-6.28%) ⬇️
x/ibc/core/04-channel/types/acknowledgement.go 100.00% <100.00%> (ø)
x/ibc/core/04-channel/types/codec.go 100.00% <100.00%> (ø)

@damiannolan
Copy link
Member Author

damiannolan commented Feb 22, 2021

The following merge checks have failed

  • golangci-lint: Unrelated to changes in this PR.
  • Protobuf / breakage: As requested in issue.

++ @colin-axner

Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@colin-axner
Copy link
Contributor

@damiannolan could you add a change log? I think it would just be under "Improvements" but it would be good to specify that acknowledgement got moved out of the channel.proto file

@damiannolan
Copy link
Member Author

damiannolan commented Feb 23, 2021

@damiannolan could you add a change log? I think it would just be under "Improvements" but it would be good to specify that acknowledgement got moved out of the channel.proto file

Sure no problem, will push an update.

Edit: Done

@colin-axner colin-axner added x/ibc A:automerge Automatically merge PR once all prerequisites pass. labels Feb 23, 2021
@colin-axner colin-axner added S:blocked Status: Blocked and removed A:automerge Automatically merge PR once all prerequisites pass. S:blocked Status: Blocked labels Feb 24, 2021
@colin-axner
Copy link
Contributor

colin-axner commented Feb 24, 2021

I'm in the process of preparing IBC to be migrated to a new repository (#8501). This requires removing IBC from the SDK (which I hope to do by the end of the week). I think it makes most sense just to migrate this pr to the new repository as well.

Edit: Ah, wait, I don't see a "transfer pull request" button or rebasing to a new repository. Let's just hold for now. I'll either merge this before removing IBC or port the changes for you

CHANGELOG.md Outdated
@@ -62,9 +62,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Improvements

* (x/auth) [\#8522](https://github.com/cosmos/cosmos-sdk/pull/8522) Allow to query all stored accounts
* (x/ibc) [\#7949](https://github.com/cosmos/cosmos-sdk/issues/7949) Message `Acknowledgement` has been moved from channel.proto to acknowledgement.proto
Copy link
Member

Choose a reason for hiding this comment

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

Should we also move the PacketState struct out of channel.

Open to either moving to packet.proto or putting PacketState and Acknowledgement structs into one separate proto file since they're conceptually linked

Copy link
Contributor

Choose a reason for hiding this comment

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

This seems like a question for the cosmos/ibc repo

)
registry.RegisterInterface(
"ibc.core.channel.v1.PacketI",
(*exported.PacketI)(nil),
)
registry.RegisterImplementations(
Copy link
Member

Choose a reason for hiding this comment

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

Is this no longer needed @colin-axner ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Duplicate registration. RegisterInterface will register implementations as well

@colin-axner colin-axner added the A:automerge Automatically merge PR once all prerequisites pass. label Mar 1, 2021
@colin-axner
Copy link
Contributor

I reverted the proto changes since they weren't necessary and the acknowledgement proto type will be removed from the ibc module eventually. Lets get this merged now. Thanks @damiannolan

@colin-axner colin-axner merged commit 0792db7 into cosmos:master Mar 1, 2021
@damiannolan
Copy link
Member Author

damiannolan commented Mar 1, 2021

Thanks @colin-axner! I may try to pick up some more issues in future to gain more knowledge of the codebase, hopefully relating to modules that are not in the process of being migrated! 😂

Cheers!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

minor channel fixes
3 participants