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

v1.16: Fix - LoadedProgramType::Closed (backport of #31922) #32030

Merged
merged 1 commit into from
Jun 8, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 8, 2023

This is an automatic backport of pull request #31922 done by Mergify.
Cherry-pick of 3f13cd3 has failed:

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

You are currently cherry-picking commit 3f13cd353.
  (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:   ledger-tool/src/program.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/bank/tests.rs

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

@mergify mergify bot added the conflicts label Jun 8, 2023
@mergify mergify bot assigned Lichtso Jun 8, 2023
* Makes Bank::load_program() return correct tombstones.

* Removes early TX failure caused by closed and invalid programs.

* Adjusts the feature gate of simplify_writable_program_account_check.

(cherry picked from commit 3f13cd3)
@Lichtso Lichtso force-pushed the mergify/bp/v1.16/pr-31922 branch from 3ec2ffa to 2f54ee9 Compare June 8, 2023 13:50
@codecov
Copy link

codecov bot commented Jun 8, 2023

Codecov Report

Merging #32030 (2f54ee9) into v1.16 (bf789b6) will decrease coverage by 0.1%.
The diff coverage is 75.4%.

@@            Coverage Diff            @@
##            v1.16   #32030     +/-   ##
=========================================
- Coverage    81.9%    81.8%   -0.1%     
=========================================
  Files         759      759             
  Lines      207408   207416      +8     
=========================================
+ Hits       169869   169873      +4     
- Misses      37539    37543      +4     

@Lichtso Lichtso requested a review from pgarg66 June 8, 2023 14:49
@Lichtso Lichtso merged commit 5cdbfc5 into v1.16 Jun 8, 2023
@Lichtso Lichtso deleted the mergify/bp/v1.16/pr-31922 branch June 8, 2023 15:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants