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

chore: adapt ics27 controller claiming of channel capability #2146

Merged
merged 9 commits into from
Aug 30, 2022

Conversation

damiannolan
Copy link
Member

Description

  • ICS27 controller now claims the channel capability passed via ibc core
  • The channel capability arg is now passed to the underlying app as nil
  • The channel capability arg in SendTx is now ignored and looked up internally
  • The testing/mock IBCModule now only claims the channel capability if it is not nil

closes: #2033


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

@damiannolan
Copy link
Member Author

Please let me know if there's any additional tests to add. I'll update with a changelog entry also 👍

@codecov-commenter
Copy link

Codecov Report

Merging #2146 (d995695) into main (f263794) will decrease coverage by 0.03%.
The diff coverage is 33.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2146      +/-   ##
==========================================
- Coverage   79.28%   79.24%   -0.04%     
==========================================
  Files         170      170              
  Lines       11855    11862       +7     
==========================================
+ Hits         9399     9400       +1     
- Misses       2040     2044       +4     
- Partials      416      418       +2     
Impacted Files Coverage Δ
...7-interchain-accounts/controller/ibc_middleware.go 81.69% <25.00%> (-3.61%) ⬇️
.../27-interchain-accounts/controller/keeper/relay.go 73.33% <40.00%> (-4.72%) ⬇️

Copy link
Contributor

@seantking seantking left a comment

Choose a reason for hiding this comment

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

Nice one! I need this merged in for #2147 :---)

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.

Aye nice! Needs a changelog entry :)

@damiannolan damiannolan enabled auto-merge (squash) August 30, 2022 18:25
@damiannolan damiannolan merged commit 56f9da2 into main Aug 30, 2022
@damiannolan damiannolan deleted the damian/2033-controller-claim-cap branch August 30, 2022 18:55
mergify bot pushed a commit that referenced this pull request Aug 30, 2022
* [WIP] adding current code, test failures due to removal of claim capaiblities in mock IBCApp

* [WIP] removing changes to fee tests

* [WIP] removing whitespaces

* adding nil check on chan caps in mock ibc module

* adding changelog entry

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
(cherry picked from commit 56f9da2)

# Conflicts:
#	CHANGELOG.md
#	modules/apps/27-interchain-accounts/controller/ibc_middleware.go
damiannolan added a commit that referenced this pull request Aug 31, 2022
…#2146) (#2150)

* chore: adapt ics27 controller claiming of channel capability (#2146)

* [WIP] adding current code, test failures due to removal of claim capaiblities in mock IBCApp

* [WIP] removing changes to fee tests

* [WIP] removing whitespaces

* adding nil check on chan caps in mock ibc module

* adding changelog entry

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
(cherry picked from commit 56f9da2)

# Conflicts:
#	CHANGELOG.md
#	modules/apps/27-interchain-accounts/controller/ibc_middleware.go

* resolving conflicts

* Update CHANGELOG.md

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Controller module should claim the channel capability instead of the Auth module
5 participants