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

Reject vote withdraws that create non-rent-exempt accounts (backport #21639) #21645

Merged
merged 2 commits into from
Dec 7, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2021

This is an automatic backport of pull request #21639 done by Mergify.
Cherry-pick of e123883 has failed:

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

You are currently cherry-picking commit e123883b2.
  (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:   program-runtime/src/invoke_context.rs
	modified:   programs/vote/src/vote_instruction.rs
	modified:   programs/vote/src/vote_state/mod.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/feature_set.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

* Reject vote withdraws that create non-rent-exempt accounts

* fix mocked instruction test

(cherry picked from commit e123883)

# Conflicts:
#	sdk/src/feature_set.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Dec 6, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 6, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 6, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 6, 2021
@codecov
Copy link

codecov bot commented Dec 7, 2021

Codecov Report

Merging #21645 (e72112e) into v1.9 (3e28ffa) will increase coverage by 0.0%.
The diff coverage is 93.5%.

@@           Coverage Diff           @@
##             v1.9   #21645   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         510      511    +1     
  Lines      142502   142591   +89     
=======================================
+ Hits       116389   116473   +84     
- Misses      26113    26118    +5     

@mergify mergify bot merged commit 89d2f34 into v1.9 Dec 7, 2021
@mergify mergify bot deleted the mergify/bp/v1.9/pr-21639 branch December 7, 2021 00:42
@brooksprumo brooksprumo mentioned this pull request Jan 5, 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant