Skip to content

[e2e] Fixes prepareProposal not to return oversized set of transactions (backport #1756)#1774

Merged
lasarojc merged 2 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-1756
Dec 7, 2023
Merged

[e2e] Fixes prepareProposal not to return oversized set of transactions (backport #1756)#1774
lasarojc merged 2 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-1756

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2023

This is an automatic backport of pull request #1756 done by Mergify.
Cherry-pick of 0bf3f0a has failed:

On branch mergify/bp/v0.37.x/pr-1756
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 0bf3f0a3e.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/app/app.go

no changes added to commit (use "git add" and/or "git commit -a")

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

@lasarojc @mergify
[e2e] Fixes prepareProposal not to return oversized set of transactio…
65ba1a2 
…ns (#1756)

* Fixes prepareProposal not to return oversized set of transactions

* Update test/e2e/app/app.go

* Fix linting error

* add changelog entry

* Avoid marshalling the tx twice

* removing unneeded changelog

(cherry picked from commit 0bf3f0a)

# Conflicts:
#	test/e2e/app/app.go
@mergify mergify bot requested a review from a team as a code owner December 7, 2023 14:48
@mergify mergify bot added the conflicts label Dec 7, 2023
@lasarojc lasarojc removed the conflicts label Dec 7, 2023
@lasarojc lasarojc merged commit 1b0372e into v0.37.x Dec 7, 2023
@lasarojc lasarojc deleted the mergify/bp/v0.37.x/pr-1756 branch December 7, 2023 15:11
@faddat faddat mentioned this pull request Jan 5, 2024
Closed
3 tasks
This was referenced Feb 25, 2024
Closed
Closed
@faddat faddat mentioned this pull request Mar 20, 2024
Open
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@lasarojc lasarojc lasarojc approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@lasarojc