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

Revert "remove test-only bool arg from calculate_fee (#3211)" #3367

Merged
merged 1 commit into from
Oct 29, 2024

Conversation

apfitzge
Copy link

@apfitzge apfitzge commented Oct 29, 2024

This reverts commit aad0381.

Problem

  • Testnet has a 0 target_lamports_per_signature in its genesis config which was triggering this case intended to be for only local-cluster/tests.

Summary of Changes

  • Revert the commit

Fixes #

@steviez
Copy link

steviez commented Oct 29, 2024

@apfitzge apfitzge added the v2.1 Backport to v2.1 branch label Oct 29, 2024
@apfitzge
Copy link
Author

The original PR #3211 was merged into master before the cut of 2.1. Added 2.1 label to backport the revert.

Copy link

mergify bot commented Oct 29, 2024

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

Copy link

@tao-stones tao-stones left a comment

Choose a reason for hiding this comment

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

clean revert

@apfitzge apfitzge added the automerge automerge Merge this Pull Request automatically once CI passes label Oct 29, 2024
Copy link

mergify bot commented Oct 29, 2024

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge automerge Merge this Pull Request automatically once CI passes label Oct 29, 2024
@apfitzge apfitzge added the automerge automerge Merge this Pull Request automatically once CI passes label Oct 29, 2024
@mergify mergify bot merged commit cec2324 into anza-xyz:master Oct 29, 2024
54 checks passed
mergify bot pushed a commit that referenced this pull request Oct 29, 2024
apfitzge added a commit that referenced this pull request Oct 30, 2024
…backport of #3367) (#3373)

Revert "remove test-only bool arg from calculate_fee (#3211)" (#3367)

This reverts commit aad0381.

(cherry picked from commit cec2324)

Co-authored-by: Andrew Fitzgerald <apfitzge@gmail.com>
ray-kast pushed a commit to abklabs/agave that referenced this pull request Nov 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge automerge Merge this Pull Request automatically once CI passes v2.1 Backport to v2.1 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants