Removes the to_builtin!() macro.

solana-labs · Apr 25, 2023 · ae6ccf4 · ae6ccf4
1 parent 1b3f0be
commit ae6ccf4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs
@@ -45,6 +45,7 @@ use {
         genesis_config::GenesisConfig,
         hash::Hash,
         pubkey::Pubkey,
+        saturating_add_assign,
         signature::{Keypair, Signature},
         timing,
         transaction::{

diff --git a/ledger/src/builtins.rs b/ledger/src/builtins.rs
@@ -1,24 +1,27 @@
 use {
     solana_program_runtime::builtin_program::BuiltinProgram,
     solana_runtime::builtins::{BuiltinFeatureTransition, Builtins},
+    solana_sdk::{bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable},
 };
 
-macro_rules! to_builtin {
-    ($b:expr) => {
-        BuiltinProgram {
-            name: $b.0.to_string(),
-            program_id: $b.1,
-            process_instruction: $b.2,
-        }
-    };
-}
-
 /// Builtin programs that are always available
 fn genesis_builtins() -> Vec<BuiltinProgram> {
     vec![
-        to_builtin!(solana_bpf_loader_deprecated_program!()),
-        to_builtin!(solana_bpf_loader_program!()),
-        to_builtin!(solana_bpf_loader_upgradeable_program!()),
+        BuiltinProgram {
+            name: "solana_bpf_loader_deprecated_program".to_string(),
+            program_id: bpf_loader_deprecated::id(),
+            process_instruction: solana_bpf_loader_program::process_instruction,
+        },
+        BuiltinProgram {
+            name: "solana_bpf_loader_program".to_string(),
+            program_id: bpf_loader::id(),
+            process_instruction: solana_bpf_loader_program::process_instruction,
+        },
+        BuiltinProgram {
+            name: "solana_bpf_loader_upgradeable_program".to_string(),
+            program_id: bpf_loader_upgradeable::id(),
+            process_instruction: solana_bpf_loader_program::process_instruction,
+        },
     ]
 }
 

diff --git a/ledger/src/lib.rs b/ledger/src/lib.rs
@@ -1,7 +1,5 @@
 #![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(min_specialization))]
 #![allow(clippy::integer_arithmetic)]
-#[macro_use]
-extern crate solana_bpf_loader_program;
 
 pub mod bank_forks_utils;
 pub mod bigtable_delete;

diff --git a/runtime/src/builtins.rs b/runtime/src/builtins.rs
@@ -1,6 +1,6 @@
 use {
     solana_program_runtime::builtin_program::BuiltinProgram,
-    solana_sdk::{feature_set, pubkey::Pubkey, stake},
+    solana_sdk::{feature_set, pubkey::Pubkey},
 };
 
 #[derive(Clone, Debug)]
@@ -86,7 +86,7 @@ fn genesis_builtins() -> Vec<BuiltinProgram> {
         },
         BuiltinProgram {
             name: "stake_program".to_string(),
-            program_id: stake::program::id(),
+            program_id: solana_stake_program::id(),
             process_instruction: solana_stake_program::stake_instruction::process_instruction,
         },
         BuiltinProgram {