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: v7 <- #979] refactor!: changing block height type from uint64 to int64 #984

Merged
merged 3 commits into from
Feb 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 19, 2024

This is an automatic backport of pull request #979 done by Mergify.
Cherry-pick of 93c127e has failed:

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

You are currently cherry-picking commit 93c127e.
  (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/query.go
	modified:   chain/cosmos/types.go
	modified:   chain/internal/tendermint/tendermint_node.go
	modified:   chain/polkadot/polkadot_chain.go
	modified:   chainset.go
	modified:   conformance/test.go
	modified:   examples/cosmos/chain_miscellaneous_test.go
	modified:   examples/cosmos/chain_upgrade_ibc_test.go
	modified:   examples/hyperspace/hyperspace_test.go
	modified:   examples/polkadot/push_wasm_client_code_test.go
	modified:   ibc/chain.go
	modified:   ibc/tx.go
	modified:   ibc/types.go
	modified:   internal/blockdb/chain.go
	modified:   internal/blockdb/collect.go
	modified:   internal/blockdb/collect_test.go
	modified:   internal/blockdb/query_test.go
	modified:   testutil/poll_for_state.go
	modified:   testutil/poll_for_state_test.go
	modified:   testutil/wait.go
	modified:   testutil/wait_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   chain/cosmos/module_gov.go
	both modified:   chain/cosmos/poll.go
	deleted by us:   chain/ethereum/ethererum_chain.go
	deleted by us:   chain/ethereum/unimplemented.go
	both modified:   chain/penumbra/penumbra_chain.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

* changing height from uint64 to int64

* remove unnecessay type castings

(cherry picked from commit 93c127e)

# Conflicts:
#	chain/cosmos/module_gov.go
#	chain/cosmos/poll.go
#	chain/ethereum/ethererum_chain.go
#	chain/ethereum/unimplemented.go
#	chain/penumbra/penumbra_chain.go
@mergify mergify bot requested a review from a team as a code owner February 19, 2024 21:11
@mergify mergify bot requested a review from boojamya February 19, 2024 21:11
@mergify mergify bot added the conflicts label Feb 19, 2024
Copy link

vercel bot commented Feb 19, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
interchaintest-docs ⬜️ Ignored (Inspect) Visit Preview Feb 19, 2024 10:23pm

@@ -124,6 +127,15 @@ func (tn *ChainNode) NewClient(addr string) error {
}

tn.Client = rpcClient

grpcConn, err := grpc.Dial(
Copy link
Member

@Reecepbcups Reecepbcups Feb 19, 2024

Choose a reason for hiding this comment

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

pulled from v8 for the module_*.go support (only gov queries here)

Future can backport other changes to v7

@Reecepbcups Reecepbcups merged commit 735fd2f into v7 Feb 19, 2024
13 checks passed
@Reecepbcups Reecepbcups deleted the mergify/bp/v7/pr-979 branch February 19, 2024 22:37
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