Refactor - Moves bpf_loader registration into the runtime

ledger/src/bank_forks_utils.rs

@@ -213,7 +213,7 @@ fn bank_forks_from_snapshot(
             genesis_config,
             &process_options.runtime_config,
             process_options.debug_keys.clone(),
-            Some(&crate::builtins::get()),
+            None,
             process_options.account_indexes.clone(),
             process_options.limit_load_slot_count_from_snapshot,
             process_options.shrink_ratio,

ledger/src/blockstore_processor.rs

@@ -713,7 +713,7 @@ pub(crate) fn process_blockstore_for_bank_0(
         Arc::new(opts.runtime_config.clone()),
         account_paths,
         opts.debug_keys.clone(),
-        Some(&crate::builtins::get()),
+        None,
         opts.account_indexes.clone(),
         opts.shrink_ratio,
         false,

ledger/src/lib.rs

@@ -14,7 +14,6 @@ pub mod blockstore_meta;
 pub mod blockstore_metrics;
 pub mod blockstore_options;
 pub mod blockstore_processor;
-pub mod builtins;
 pub mod genesis_utils;
 pub mod leader_schedule;
 pub mod leader_schedule_cache;

program-test/src/lib.rs

@@ -72,9 +72,6 @@ pub use {
 
 pub mod programs;
 
-#[macro_use]
-extern crate solana_bpf_loader_program;
-
 /// Errors from the program test environment
 #[derive(Error, Debug, PartialEq, Eq)]
 pub enum ProgramTestError {
@@ -787,16 +784,6 @@ impl ProgramTest {
             }),
         );
 
-        // Add loaders
-        macro_rules! add_builtin {
-            ($b:expr) => {
-                bank.add_builtin(&$b.0, &$b.1, $b.2)
-            };
-        }
-        add_builtin!(solana_bpf_loader_deprecated_program!());
-        add_builtin!(solana_bpf_loader_program!());
-        add_builtin!(solana_bpf_loader_upgradeable_program!());
-
         // Add commonly-used SPL programs as a convenience to the user
         for (program_id, account) in programs::spl_programs(&Rent::default()).iter() {
             bank.store_account(program_id, account);

programs/bpf-loader-tests/tests/common.rs

@@ -1,12 +1,12 @@
 #![allow(dead_code)]
 
 use {
-    solana_bpf_loader_program::{process_instruction, upgradeable::id},
+    solana_bpf_loader_program::process_instruction,
     solana_program_test::*,
     solana_sdk::{
         account::AccountSharedData,
         account_utils::StateMut,
-        bpf_loader_upgradeable::UpgradeableLoaderState,
+        bpf_loader_upgradeable::{id, UpgradeableLoaderState},
         instruction::{Instruction, InstructionError},
         pubkey::Pubkey,
         signature::{Keypair, Signer},

programs/bpf_loader/src/lib.rs

@@ -1,10 +1,8 @@
 #![deny(clippy::integer_arithmetic)]
 #![deny(clippy::indexing_slicing)]
 
-pub mod deprecated;
 pub mod serialization;
 pub mod syscalls;
-pub mod upgradeable;
 
 use {
     solana_measure::measure::Measure,
@@ -61,12 +59,6 @@ use {
     },
 };
 
-solana_sdk::declare_builtin!(
-    solana_sdk::bpf_loader::ID,
-    solana_bpf_loader_program,
-    solana_bpf_loader_program::process_instruction
-);
-
 #[allow(clippy::too_many_arguments)]
 pub fn load_program_from_bytes(
     feature_set: &FeatureSet,

programs/sbf/benches/bpf_loader.rs

@@ -6,8 +6,6 @@
 use {solana_rbpf::memory_region::MemoryState, std::slice};
 
 extern crate test;
-#[macro_use]
-extern crate solana_bpf_loader_program;
 
 use {
     byteorder::{ByteOrder, LittleEndian, WriteBytesExt},
@@ -193,9 +191,7 @@ fn bench_program_execute_noop(bencher: &mut Bencher) {
         mint_keypair,
         ..
     } = create_genesis_config(50);
-    let mut bank = Bank::new_for_benches(&genesis_config);
-    let (name, id, entrypoint) = solana_bpf_loader_program!();
-    bank.add_builtin(&name, &id, entrypoint);
+    let bank = Bank::new_for_benches(&genesis_config);
     let bank = Arc::new(bank);
     let bank_client = BankClient::new_shared(&bank);