* Make BPF Loader static (#11516)
(cherry picked from commit 7c736f71fe
)
# Conflicts:
# Cargo.lock
# core/Cargo.toml
# core/src/lib.rs
# core/src/validator.rs
# genesis-programs/src/lib.rs
# programs/bpf_loader/src/deprecated.rs
# programs/bpf_loader/src/lib.rs
# sdk/src/entrypoint_native.rs
# sdk/src/lib.rs
* resolve conflicts
Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
@@ -72,9 +72,6 @@ pub mod vote_stake_tracker;
|
||||
pub mod weighted_shuffle;
|
||||
pub mod window_service;
|
||||
|
||||
#[macro_use]
|
||||
extern crate solana_bpf_loader_program;
|
||||
|
||||
#[macro_use]
|
||||
extern crate solana_budget_program;
|
||||
|
||||
|
@@ -871,10 +871,6 @@ impl TestValidator {
|
||||
genesis_config
|
||||
.native_instruction_processors
|
||||
.push(solana_budget_program!());
|
||||
genesis_config
|
||||
.native_instruction_processors
|
||||
.push(solana_bpf_loader_program!());
|
||||
|
||||
genesis_config.rent.lamports_per_byte_year = 1;
|
||||
genesis_config.rent.exemption_threshold = 1.0;
|
||||
genesis_config.fee_rate_governor = FeeRateGovernor::new(fees, 0);
|
||||
|
Reference in New Issue
Block a user