Skip to content
This repository has been archived by the owner on Jan 31, 2025. It is now read-only.

chore: Remove BlockSDK Module (backport #530) #544

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 24, 2024


This is an automatic backport of pull request #530 done by [Mergify](https://mergify.com).

(cherry picked from commit 97e5731)

# Conflicts:
#	abci/abci.go
#	abci/abci_test.go
#	abci/checktx/check_tx_test.go
#	abci/utils_test.go
#	block/mempool.go
#	block/mempool_test.go
#	tests/app/app.go
#	tests/app/config.go
#	tests/e2e/block_sdk_e2e_test.go
#	tests/integration/integration_test.go
#	tests/integration/network/network_test.go
#	testutils/keeper/keeper.go
#	testutils/mempool/mempool.go
#	testutils/networksuite/networksuite.go
Copy link
Author

mergify bot commented Jun 24, 2024

Cherry-pick of 97e5731 has failed:

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

You are currently cherry-picking commit 97e5731.
  (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:   tests/app/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   abci/abci.go
	both modified:   abci/abci_test.go
	both modified:   abci/checktx/check_tx_test.go
	both modified:   abci/utils_test.go
	both modified:   block/mempool.go
	both modified:   block/mempool_test.go
	both modified:   tests/app/app.go
	both modified:   tests/app/config.go
	both modified:   tests/e2e/block_sdk_e2e_test.go
	both modified:   tests/integration/integration_test.go
	both modified:   tests/integration/network/network_test.go
	both modified:   testutils/keeper/keeper.go
	both modified:   testutils/mempool/mempool.go
	both modified:   testutils/networksuite/networksuite.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 mergify bot added the conflicts label Jun 24, 2024
@davidterpay
Copy link
Contributor

module is not on release branch v1

@mergify mergify bot deleted the mergify/bp/release/v1.x.x/pr-530 branch June 24, 2024 17:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant