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

chore: optimize checkTx (backport #3954) #3963

Merged
merged 4 commits into from
Oct 15, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2024

Overview

this PR makes a simple optimization for checkTx


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

## Overview

this PR makes a simple optimization for checkTx

---------

Co-authored-by: Rootul P <[email protected]>
Co-authored-by: CHAMI Rachid <[email protected]>
(cherry picked from commit ca222a8)

# Conflicts:
#	app/test/process_proposal_test.go
#	x/blob/ante/blob_share_decorator_test.go
@mergify mergify bot requested a review from a team as a code owner October 10, 2024 23:19
@mergify mergify bot added the conflicts label Oct 10, 2024
Copy link
Contributor Author

mergify bot commented Oct 10, 2024

Cherry-pick of ca222a8 has failed:

On branch mergify/bp/v2.x/pr-3954
Your branch is up to date with 'origin/v2.x'.

You are currently cherry-picking commit ca222a86.
  (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:   app/process_proposal.go
	modified:   app/test/prepare_proposal_test.go
	modified:   app/validate_txs.go
	modified:   x/blob/ante/blob_share_decorator.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/test/process_proposal_test.go
	both modified:   x/blob/ante/blob_share_decorator_test.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 requested review from rootulp and rach-id October 10, 2024 23:19
@github-actions github-actions bot added the bot item was created by a bot label Oct 10, 2024
app/process_proposal.go Outdated Show resolved Hide resolved
app/test/process_proposal_test.go Outdated Show resolved Hide resolved
@rootulp rootulp self-assigned this Oct 11, 2024
@rootulp rootulp marked this pull request as draft October 11, 2024 13:43
@rootulp rootulp marked this pull request as ready for review October 11, 2024 13:56
@rootulp rootulp removed the conflicts label Oct 11, 2024
@rootulp
Copy link
Collaborator

rootulp commented Oct 11, 2024

I'll wait for @evan-forbes 's approval b/c I made a few very minor changes to the original PR

Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

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

👍

@evan-forbes evan-forbes merged commit 54446a5 into v2.x Oct 15, 2024
33 checks passed
@evan-forbes evan-forbes deleted the mergify/bp/v2.x/pr-3954 branch October 15, 2024 01:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants