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

genesis-programs: Simplify get_programs(), specify a real Preview activation epoch for new BPFLoader#11916

Merged
mergify[bot] merged 1 commit intosolana-labs:masterfrom
mvines:gp
Aug 31, 2020
Merged

genesis-programs: Simplify get_programs(), specify a real Preview activation epoch for new BPFLoader#11916
mergify[bot] merged 1 commit intosolana-labs:masterfrom
mvines:gp

Conversation

@mvines
Copy link
Copy Markdown
Contributor

@mvines mvines commented Aug 31, 2020

  • Only need a single vec![] declaration for each operation mode. The use of .extend() seemed overly verbose
  • The new bpfloader needs to be activated at an actual epoch >= 0 for Preview to avoid an assertion when loading the snapshot that'll be used to restart testnet

@mvines mvines added the v1.3 label Aug 31, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 31, 2020

Codecov Report

Merging #11916 into master will decrease coverage by 0.0%.
The diff coverage is 73.3%.

@@            Coverage Diff            @@
##           master   #11916     +/-   ##
=========================================
- Coverage    82.1%    82.1%   -0.1%     
=========================================
  Files         331      331             
  Lines       78062    78059      -3     
=========================================
- Hits        64166    64155     -11     
- Misses      13896    13904      +8     

Comment thread genesis-programs/src/lib.rs Outdated
Comment thread genesis-programs/src/lib.rs Outdated
),
(Program::BuiltinLoader(solana_bpf_loader_program!()), 89),
],
OperatingMode::Stable => {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nits: we can strip { and } just like OperatingMode::Preview.

Comment thread runtime/src/bank.rs
*callback_w = Some(entered_epoch_callback);
}
// immedaitely fire the callback as initial invocation
// immediately fire the callback as initial invocation
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops...

ryoqun
ryoqun previously approved these changes Aug 31, 2020
Copy link
Copy Markdown
Contributor

@ryoqun ryoqun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm with nits

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants