Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Fix nonce fee_calculator overwrite (bp #10973)#10975

Merged
CriesofCarrots merged 2 commits intov1.1from
mergify/bp/v1.1/pr-10973
Jul 9, 2020
Merged

Fix nonce fee_calculator overwrite (bp #10973)#10975
CriesofCarrots merged 2 commits intov1.1from
mergify/bp/v1.1/pr-10973

Conversation

@mergify
Copy link
Copy Markdown
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 automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 9, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jul 9, 2020

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jul 9, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 9, 2020

Codecov Report

Merging #10975 into v1.1 will decrease coverage by 0.0%.
The diff coverage is 97.4%.

@@           Coverage Diff            @@
##            v1.1   #10975     +/-   ##
========================================
- Coverage   81.2%    81.1%   -0.1%     
========================================
  Files        292      292             
  Lines      68622    68678     +56     
========================================
- Hits       55736    55730      -6     
- Misses     12886    12948     +62     

@CriesofCarrots CriesofCarrots merged commit 1c703af into v1.1 Jul 9, 2020
@mergify mergify Bot deleted the mergify/bp/v1.1/pr-10973 branch July 9, 2020 22:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

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