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: log filtered transactions and fix gas limits in tests (backport #2518) #2539

Merged
merged 7 commits into from
Sep 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2023

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

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

You are currently cherry-picking commit dd50ae7.
  (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/prepare_proposal.go
	modified:   app/validate_txs.go
	modified:   test/util/malicious/out_of_order_prepare.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/test/fuzz_abci_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

## Overview

This PR adds loggers back to the filter functions (but actually uses
them this time), and logs when transaction get filtered during
`PrepareProposal`. It also re-adds an obtuse gas limit to the
transactions in the `TestPrepareProposalConsistency` test, where those
errors were getting caught by the filter functions.

part of #2517

## Checklist

- [x] New and updated code has appropriate documentation
- [x] New and updated code has new and/or updated testing
- [x] Required CI checks are passing
- [x] Visual proof for any user facing features like CLI or
documentation updates
- [x] Linked issues closed with keywords

(cherry picked from commit dd50ae7)

# Conflicts:
#	app/test/fuzz_abci_test.go
@mergify mergify bot added the conflicts label Sep 19, 2023
@github-actions github-actions bot added the bot item was created by a bot label Sep 19, 2023
@celestia-bot celestia-bot requested a review from a team September 19, 2023 12:34
@evan-forbes evan-forbes enabled auto-merge (squash) September 19, 2023 12:49
evan-forbes
evan-forbes previously approved these changes Sep 19, 2023
cmwaters
cmwaters previously approved these changes Sep 19, 2023
@evan-forbes
Copy link
Member

rootulp
rootulp previously approved these changes Sep 19, 2023
@rootulp
Copy link
Collaborator

rootulp commented Sep 19, 2023

I think we need celestiaorg/.github#66

@evan-forbes evan-forbes dismissed stale reviews from rootulp, cmwaters, and themself via 8e8e08d September 19, 2023 15:24
@celestia-bot celestia-bot requested a review from a team September 19, 2023 15:29
evan-forbes
evan-forbes previously approved these changes Sep 19, 2023
.github/workflows/markdown-linter.yml Outdated Show resolved Hide resolved
rootulp
rootulp previously approved these changes Sep 19, 2023
.github/workflows/markdown-linter.yml Outdated Show resolved Hide resolved
.github/markdown-linter-config.json Outdated Show resolved Hide resolved
@evan-forbes evan-forbes dismissed stale reviews from rootulp and themself via 6f510d8 September 19, 2023 16:14
@celestia-bot celestia-bot requested a review from a team September 19, 2023 16:14
@codecov-commenter
Copy link

codecov-commenter commented Sep 19, 2023

Codecov Report

Merging #2539 (5eb4931) into v1.x (af17626) will decrease coverage by 0.04%.
Report is 2 commits behind head on v1.x.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             v1.x    #2539      +/-   ##
==========================================
- Coverage   20.37%   20.33%   -0.04%     
==========================================
  Files         138      138              
  Lines       15885    15901      +16     
==========================================
- Hits         3237     3234       -3     
- Misses      12341    12359      +18     
- Partials      307      308       +1     
Files Changed Coverage Δ
app/prepare_proposal.go 0.00% <0.00%> (ø)
app/validate_txs.go 0.00% <0.00%> (ø)

... and 1 file with indirect coverage changes

@evan-forbes evan-forbes merged commit 44e13fa into v1.x Sep 19, 2023
23 checks passed
@evan-forbes evan-forbes deleted the mergify/bp/v1.x/pr-2518 branch September 19, 2023 16:37
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.

None yet

4 participants