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 bad rent in Bank::deposit as if since epoch 0 (bp #10468) #11538

Merged
merged 3 commits into from
Aug 11, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 11, 2020

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

Cherry-pick of 6c242f3 has failed:

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

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

Changes to be committed:

	modified:   docs/src/implemented-proposals/rent.md
	modified:   runtime/src/bank.rs
	modified:   sdk/src/genesis_config.rs

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

	both modified:   runtime/src/accounts.rs
	both modified:   runtime/src/rent_collector.rs

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/

* Fix bad rent in Bank::deposit as if since epoch 0

* Remove redundant predicate

* Rename

* Start to add tests with some cleanup

* Forgot to add refactor code...

* Enchance test

* Really fix rent timing in deposit with robust test

* Simplify new behavior by disabling rent altogether

(cherry picked from commit 6c242f3)

# Conflicts:
#	runtime/src/accounts.rs
#	runtime/src/rent_collector.rs
@mergify mergify bot added the conflicts label Aug 11, 2020
@ryoqun ryoqun added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Aug 11, 2020
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 11, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 11, 2020

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 11, 2020
@codecov
Copy link

codecov bot commented Aug 11, 2020

Codecov Report

Merging #11538 into v1.2 will increase coverage by 0.0%.
The diff coverage is 91.0%.

@@          Coverage Diff           @@
##            v1.2   #11538   +/-   ##
======================================
  Coverage   81.8%    81.8%           
======================================
  Files        319      319           
  Lines      76120    76172   +52     
======================================
+ Hits       62312    62374   +62     
+ Misses     13808    13798   -10     

@mergify mergify bot merged commit e477501 into v1.2 Aug 11, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-10468 branch August 11, 2020 16:55
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