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

Fix nonce fee_calculator overwrite (bp #10973) #10976

Merged
merged 1 commit into from
Jul 9, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2020

This is an automated backport of pull request #10973 done by Mergify

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 simulator.

Finally, you can contact us on https://mergify.io/

* Add failing test

* Pass fee_calculator to prepare_if_nonce_account; only overwrite in error case

(cherry picked from commit 25228ca)
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 9, 2020
@codecov
Copy link

codecov bot commented Jul 9, 2020

Codecov Report

Merging #10976 into v1.2 will decrease coverage by 0.0%.
The diff coverage is 96.2%.

@@           Coverage Diff            @@
##            v1.2   #10976     +/-   ##
========================================
- Coverage   81.9%    81.9%   -0.1%     
========================================
  Files        307      307             
  Lines      71798    71856     +58     
========================================
+ Hits       58851    58891     +40     
- Misses     12947    12965     +18     

@CriesofCarrots CriesofCarrots merged commit 94b2565 into v1.2 Jul 9, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-10973 branch July 9, 2020 22:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant