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

deps: upgrade capability to sdk v0.50 and remove ibc-go dependency (backport #4068) #4083

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2023

This is an automatic backport of pull request #4068 done by Mergify.
Cherry-pick of 49cdfc5 has failed:

On branch mergify/bp/capability/release/v1.0.x/pr-4068
Your branch is up to date with 'origin/capability/release/v1.0.x'.

You are currently cherry-picking commit 49cdfc5f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   modules/capability/keeper/keeper.go
	modified:   modules/capability/keeper/keeper_test.go
	modified:   modules/capability/simulation/genesis.go
	modified:   modules/capability/simulation/genesis_test.go
	modified:   modules/capability/types/types.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/capability/capability_test.go
	both modified:   modules/capability/genesis_test.go
	both modified:   modules/capability/go.mod
	both modified:   modules/capability/go.sum
	both modified:   modules/capability/module.go
	both modified:   modules/capability/simulation/decoder_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…4068)

* adding testing/simapp dir for testing purposes

* upgrade to sdk v0.50.0-alpha.1 and rm dep on ibc-go simapp

* refactor and improve capability tests to use test helpers in favour of simapp

* rm simapp and go mod tidy

* update godoc

* assert the transfer capability does not exist until memstore is reinitialised

(cherry picked from commit 49cdfc5)

# Conflicts:
#	modules/capability/capability_test.go
#	modules/capability/genesis_test.go
#	modules/capability/go.mod
#	modules/capability/go.sum
#	modules/capability/module.go
#	modules/capability/simulation/decoder_test.go
@damiannolan damiannolan removed their assignment Jul 14, 2023
@damiannolan
Copy link
Member

build issues? 🤔 not on my machine -_-

@DimitrisJim
Copy link
Contributor

oh, we'd need to backport #3851 here too for e2e failures, just seeing how old the branch we're backproting into is

@damiannolan
Copy link
Member

damiannolan commented Jul 14, 2023

oh, we'd need to backport #3851 here too for e2e failures, just seeing how old the branch we're backproting into is

oh cool, do you think you could slap the new label on that PR to get a backport going? Any idea if this could be why we're seeing build errors in CI for unsafe.String etc usage in transitive deps?

edit: these builds were passing on PR to main https://github.com/cosmos/ibc-go/actions/runs/5544957269/jobs/10123169873 but as soon as merged it failed to build.

@DimitrisJim
Copy link
Contributor

DimitrisJim commented Jul 14, 2023

Any idea if this could be why we're seeing build errors in CI for unsafe.String etc usage in transitive deps?

I wouldn't have thought so tbh, one is a failure during runtime after the binary has been successfully built, the other is a build error.

But I also can't get it to repro locally.

@damiannolan damiannolan self-requested a review July 14, 2023 07:45
@DimitrisJim
Copy link
Contributor

DimitrisJim commented Jul 14, 2023

I think it's using 1.19 somehow, workflows haven't been updated to point to 1.20? edit: yea, capability workflow is using 1.19, I'd assume that was it.

And these functions were added in 1.20 https://pkg.go.dev/unsafe#StringData

@damiannolan
Copy link
Member

I think it's using 1.19 somehow, workflows haven't been updated to point to 1.20? edit: yea, capability workflow is using 1.19, I'd assume that was it.

And these functions were added in 1.20 https://pkg.go.dev/unsafe#StringData

damn, if only I saw your comment sooner, I just came to the same conclusion! haha

Copy link
Member

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

Looks good to go now! Thanks for your help @DimitrisJim ❤️

@damiannolan damiannolan merged commit 72bc817 into capability/release/v1.0.x Jul 14, 2023
@damiannolan damiannolan deleted the mergify/bp/capability/release/v1.0.x/pr-4068 branch July 14, 2023 08:23
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.

2 participants