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

Duplicate SimApp into callbacks directory (backport #4337) #4461

Merged
merged 3 commits into from
Aug 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2023

This is an automatic backport of pull request #4337 done by Mergify.
Cherry-pick of 6610409 has failed:

On branch mergify/bp/release/v7.3.x/pr-4337
Your branch is up to date with 'origin/release/v7.3.x'.

You are currently cherry-picking commit 66104094.
  (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/apps/callbacks/callbacks_test.go
	modified:   modules/apps/callbacks/ibc_middleware_test.go
	new file:   modules/apps/callbacks/testing/simapp/ante_handler.go
	new file:   modules/apps/callbacks/testing/simapp/app.go
	new file:   modules/apps/callbacks/testing/simapp/contract_keeper.go
	new file:   modules/apps/callbacks/testing/simapp/encoding.go
	new file:   modules/apps/callbacks/testing/simapp/export.go
	new file:   modules/apps/callbacks/testing/simapp/genesis.go
	new file:   modules/apps/callbacks/testing/simapp/genesis_account.go
	new file:   modules/apps/callbacks/testing/simapp/params/amino.go
	new file:   modules/apps/callbacks/testing/simapp/params/doc.go
	new file:   modules/apps/callbacks/testing/simapp/params/encoding.go
	new file:   modules/apps/callbacks/testing/simapp/params/proto.go
	modified:   modules/apps/callbacks/transfer_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/callbacks/fee_transfer_test.go
	both modified:   modules/apps/callbacks/ica_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

(cherry picked from commit 6610409)

# Conflicts:
#	modules/apps/callbacks/fee_transfer_test.go
#	modules/apps/callbacks/ica_test.go
@mergify mergify bot added the conflicts label Aug 25, 2023
@srdtrk srdtrk self-assigned this Aug 25, 2023
@srdtrk srdtrk requested a review from chatton August 25, 2023 10:35
@srdtrk srdtrk removed the conflicts label Aug 25, 2023
func OverrideSendMsgWithAssertion(chain *ibctesting.TestChain, expPass bool) {
// overrideSendMsg overrides both chains' SendMsgs function to a version that doesn't require
// that the transaction is successful.
func overrideSendMsg(chain *ibctesting.TestChain) {
Copy link
Member

Choose a reason for hiding this comment

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

This is needed because v7.3's SendMsg requires the tx to be successful, so we override it. (chain.go is not one of the copied files)

Copy link
Member

Choose a reason for hiding this comment

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

This file was not copied in the original PR. I copied it and removed all the functions except SignAndDeliver so that it can be used in overrideSendMsg function

@@ -165,12 +163,7 @@ func (s *CallbacksTestSuite) ExecuteTransfer(memo string, expSendFailure bool) {
clienttypes.NewHeight(1, 100), 0, memo,
)

if expSendFailure {
Copy link
Member

Choose a reason for hiding this comment

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

Override has made these expSendFailure variables obsolete.

@srdtrk srdtrk added testing Testing package and unit/integration tests callbacks middleware Issues for callbacks middleware labels Aug 25, 2023
Copy link
Contributor

@crodriguezvega crodriguezvega 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 me. Maybe worth mentioning that the argument list of SignAndDeliver has been modified when copying the function over from main, right?

@crodriguezvega crodriguezvega merged commit 8b6fc4a into release/v7.3.x Aug 25, 2023
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v7.3.x/pr-4337 branch August 25, 2023 11:52
@chatton
Copy link
Contributor

chatton commented Aug 28, 2023

LGTM @srdtrk 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
callbacks middleware Issues for callbacks middleware testing Testing package and unit/integration tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants