Cleanup load_program() in bank.rs #32146
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pgarg66
force-pushed
the
cleanup-bank-load-program
branch
2 times, most recently
from
d35b78b to
2de326c
Compare
Codecov Report
@@ Coverage Diff @@
## master #32146 +/- ##
=======================================
Coverage 82.0% 82.0%
=======================================
Files 780 780
Lines 210860 210843 -17
=======================================
+ Hits 172944 172963 +19
+ Misses 37916 37880 -36 |
github-actions
bot
added
the
stale
pgarg66
removed
the
stale
github-actions
bot
added
the
stale
pgarg66
force-pushed
the
cleanup-bank-load-program
branch
from
2de326c to
cec962c
Compare
pgarg66
removed
the
stale
Lichtso
reviewed
Jul 21, 2023
Lichtso
requested changes
Jul 21, 2023
runtime/src/bank.rs
Outdated
| }) = transaction_accounts[0].1.state() | ||
|
|
||
| if !solana_bpf_loader_program::check_loader_id(program_account.owner()) { | ||
| return ProgramAccountLoadResult::InvalidAccountData; |
There was a problem hiding this comment.
I think this originally returned InstructionError::IncorrectProgramId in load_program_from_account() and all errors from there were turned into LoadedProgramType::FailedVerification in load_program(). But it should be unreachable, so try placing a debug_assert(solana_bpf_loader_program::check_loader_id(); here instead.
Lichtso
previously approved these changes
Jul 21, 2023
Lichtso
approved these changes
Jul 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
The load_program function can use some streamlining and cleanup. The old code was written because of executor cache usage of bpf_loader. Since then the executor cache code has been deleted.
Summary of Changes
load_program()to remove the call toload_program_from_account()load_program_from_account()Fixes #