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

Check bank capitalization (bp #11927) #12184

Merged
merged 3 commits into from
Sep 11, 2020
Merged

Check bank capitalization (bp #11927) #12184

merged 3 commits into from
Sep 11, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 11, 2020

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

Cherry-pick of de4a613 has failed:

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

You are currently cherry-picking commit de4a61361.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   accounts-bench/src/main.rs
	modified:   core/src/non_circulating_supply.rs
	modified:   core/src/rpc.rs
	modified:   ledger-tool/src/main.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   runtime/benches/accounts.rs
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/accounts_db.rs
	modified:   runtime/src/bank.rs
	modified:   sdk/src/genesis_config.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Cargo.lock
	both modified:   accounts-bench/Cargo.toml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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 simulator.

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

* Check bank capitalization

* Simplify and unify capitalization calculation

* Improve and add tests

* Avoid overflow and inhibit automatic restart

* Fix test

* Tweak checked sum for cap. and add tests

* Fix broken build after merge conflicts..

* Rename to ClusterType

* Rename confusing method

* Clarify comment

* Verify cap. in rent and inflation tests

Co-authored-by: Stephen Akridge <[email protected]>
(cherry picked from commit de4a613)

# Conflicts:
#	Cargo.lock
#	accounts-bench/Cargo.toml
@mergify mergify bot added the conflicts label Sep 11, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 11, 2020
@codecov
Copy link

codecov bot commented Sep 11, 2020

Codecov Report

Merging #12184 into v1.3 will decrease coverage by 0.0%.
The diff coverage is 90.3%.

@@           Coverage Diff            @@
##            v1.3   #12184     +/-   ##
========================================
- Coverage   82.2%    82.2%   -0.1%     
========================================
  Files        337      337             
  Lines      79417    79564    +147     
========================================
+ Hits       65304    65421    +117     
- Misses     14113    14143     +30     

@mergify mergify bot merged commit 640bf70 into v1.3 Sep 11, 2020
@mergify mergify bot deleted the mergify/bp/v1.3/pr-11927 branch September 11, 2020 18:04
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 conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant