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

[BP: v5 <- #679] refactor: use cosmos sdk Int type for balances/token amounts #684

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 2, 2023

This is an automatic backport of pull request #679 done by Mergify.
Cherry-pick of 8e02aef has failed:

On branch mergify/bp/v5/pr-679
Your branch is up to date with 'origin/v5'.

You are currently cherry-picking commit 8e02aef.
  (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:   chain/cosmos/chain_node.go
	modified:   chain/cosmos/cosmos_chain.go
	modified:   chain/cosmos/poll.go
	modified:   chain/penumbra/penumbra_app_node.go
	modified:   chain/penumbra/penumbra_chain.go
	modified:   chain/polkadot/parachain_node.go
	modified:   chain/polkadot/polkadot_chain.go
	modified:   chain/polkadot/relay_chain_node.go
	modified:   chain/polkadot/tx.go
	modified:   ibc/chain.go
	modified:   interchain.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   chain/polkadot/query.go
	both modified:   conformance/flush.go
	both modified:   conformance/test.go
	both modified:   examples/cosmos/light_client_test.go
	deleted by us:   examples/hyperspace/hyperspace_test.go
	both modified:   examples/ibc/interchain_accounts_test.go
	both modified:   examples/ibc/learn_ibc_test.go
	both modified:   examples/ibc/packet_forward_test.go
	deleted by us:   examples/ibc/wasm/wasm_ibc_test.go
	deleted by us:   examples/ibc/wasm/wasm_icq_test.go
	both modified:   examples/polkadot/polkadot_chain_test.go
	deleted by us:   examples/polkadot/push_wasm_client_code_test.go
	both modified:   go.mod
	both modified:   ibc/types.go
	both modified:   interchain_test.go
	both modified:   internal/blockdb/messages_view_test.go
	both modified:   test_user.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

* refactor: use csdk Int type for balances/token amounts

* chore: use ZeroInt func

(cherry picked from commit 8e02aef)

# Conflicts:
#	chain/polkadot/query.go
#	conformance/flush.go
#	conformance/test.go
#	examples/cosmos/light_client_test.go
#	examples/hyperspace/hyperspace_test.go
#	examples/ibc/interchain_accounts_test.go
#	examples/ibc/learn_ibc_test.go
#	examples/ibc/packet_forward_test.go
#	examples/ibc/wasm/wasm_ibc_test.go
#	examples/ibc/wasm/wasm_icq_test.go
#	examples/polkadot/polkadot_chain_test.go
#	examples/polkadot/push_wasm_client_code_test.go
#	go.mod
#	ibc/types.go
#	interchain_test.go
#	internal/blockdb/messages_view_test.go
#	test_user.go
@mergify mergify bot requested a review from a team as a code owner August 2, 2023 15:34
@mergify mergify bot requested a review from vimystic August 2, 2023 15:34
@mergify mergify bot assigned jtieri Aug 2, 2023
@boojamya
Copy link
Contributor

Closing. As this branch is no longer being maintained.

@boojamya boojamya closed this Aug 15, 2023
@mergify mergify bot deleted the mergify/bp/v5/pr-679 branch August 15, 2023 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants