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

Prevent new RentPaying state created by paying fees (backport #23358) #23360

Merged
merged 2 commits into from
Feb 26, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2022

This is an automatic backport of pull request #23358 done by Mergify.
Cherry-pick of 36484f4 has failed:

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

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

Changes to be committed:
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/bank.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/account_rent_state.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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 config editor.

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

* Add failing test

* Check fee-payer rent-state change on load

* Add more test cases

* Review comments

(cherry picked from commit 36484f4)

# Conflicts:
#	runtime/src/account_rent_state.rs
@mergify mergify bot added the conflicts label Feb 26, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 26, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 26, 2022

automerge label removed due to a CI failure

@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 Feb 26, 2022
@mergify mergify bot merged commit f42f094 into v1.9 Feb 26, 2022
@codecov
Copy link

codecov bot commented Feb 26, 2022

Codecov Report

Merging #23360 (039e3a2) into v1.9 (ef9ffff) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff            @@
##             v1.9   #23360    +/-   ##
========================================
  Coverage    81.6%    81.7%            
========================================
  Files         530      530            
  Lines      148074   148236   +162     
========================================
+ Hits       120923   121113   +190     
+ Misses      27151    27123    -28     

@mergify mergify bot deleted the mergify/bp/v1.9/pr-23358 branch February 26, 2022 21:37
@github-actions
Copy link
Contributor

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 30, 2022
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 conflicts locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0 participants