program-runtime: hoist MessageProcessor up to SVM (solana-labs#586)

buffalojoec · Apr 4, 2024 · 526979d · 526979d
1 parent dcc195e
commit 526979d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml
@@ -21,7 +21,6 @@ num-derive = { workspace = true }
 num-traits = { workspace = true }
 percentage = { workspace = true }
 rand = { workspace = true }
-serde = { workspace = true, features = ["derive", "rc"] }
 solana-frozen-abi = { workspace = true }
 solana-frozen-abi-macro = { workspace = true }
 solana-measure = { workspace = true }
@@ -32,7 +31,7 @@ thiserror = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-libsecp256k1 = { workspace = true }
+serde = { workspace = true }
 solana-logger = { workspace = true }
 solana-sdk = { workspace = true, features = ["dev-context-only-utils"] }
 test-case = { workspace = true }

diff --git a/program-runtime/src/lib.rs b/program-runtime/src/lib.rs
@@ -15,7 +15,6 @@ pub mod compute_budget_processor;
 pub mod invoke_context;
 pub mod loaded_programs;
 pub mod log_collector;
-pub mod message_processor;
 pub mod prioritization_fee;
 pub mod runtime_config;
 pub mod stable_log;

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/svm/Cargo.toml b/svm/Cargo.toml
@@ -13,6 +13,7 @@ edition = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
 percentage = { workspace = true }
+serde = { workspace = true, features = ["derive", "rc"] }
 solana-bpf-loader-program = { workspace = true }
 solana-frozen-abi = { workspace = true }
 solana-frozen-abi-macro = { workspace = true }
@@ -29,6 +30,8 @@ name = "solana_svm"
 
 [dev-dependencies]
 bincode = { workspace = true }
+libsecp256k1 = { workspace = true }
+rand = { workspace = true }
 solana-logger = { workspace = true }
 solana-sdk = { workspace = true, features = ["dev-context-only-utils"] }
 

diff --git a/svm/src/lib.rs b/svm/src/lib.rs
@@ -4,6 +4,7 @@
 pub mod account_loader;
 pub mod account_overrides;
 pub mod account_rent_state;
+pub mod message_processor;
 pub mod transaction_account_state_info;
 pub mod transaction_error_metrics;
 pub mod transaction_processor;

diff --git a/program-runtime/src/message_processor.rs → svm/src/message_processor.rs b/program-runtime/src/message_processor.rs → svm/src/message_processor.rs
@@ -1,10 +1,10 @@
 use {
-    crate::{
+    serde::{Deserialize, Serialize},
+    solana_measure::measure::Measure,
+    solana_program_runtime::{
         invoke_context::InvokeContext,
         timings::{ExecuteDetailsTimings, ExecuteTimings},
     },
-    serde::{Deserialize, Serialize},
-    solana_measure::measure::Measure,
     solana_sdk::{
         account::WritableAccount,
         message::SanitizedMessage,
@@ -34,7 +34,6 @@ impl MessageProcessor {
     /// For each instruction it calls the program entrypoint method and verifies that the result of
     /// the call does not violate the bank's accounting rules.
     /// The accounts are committed back to the bank only if every instruction succeeds.
-    #[allow(clippy::too_many_arguments)]
     pub fn process_message(
         message: &SanitizedMessage,
         program_indices: &[Vec<IndexOfAccount>],
@@ -146,11 +145,10 @@ impl MessageProcessor {
 mod tests {
     use {
         super::*,
-        crate::{
+        solana_program_runtime::{
             compute_budget::ComputeBudget,
             declare_process_instruction,
             loaded_programs::{LoadedProgram, LoadedProgramsForTxBatch},
-            message_processor::MessageProcessor,
             sysvar_cache::SysvarCache,
         },
         solana_sdk::{

diff --git a/svm/src/transaction_processor.rs b/svm/src/transaction_processor.rs
@@ -4,6 +4,7 @@ use {
             load_accounts, LoadedTransaction, TransactionCheckResult, TransactionLoadResult,
         },
         account_overrides::AccountOverrides,
+        message_processor::MessageProcessor,
         transaction_account_state_info::TransactionAccountStateInfo,
         transaction_error_metrics::TransactionErrorMetrics,
         transaction_results::{
@@ -22,7 +23,6 @@ use {
             ProgramRuntimeEnvironments, DELAY_VISIBILITY_SLOT_OFFSET,
         },
         log_collector::LogCollector,
-        message_processor::MessageProcessor,
         runtime_config::RuntimeConfig,
         sysvar_cache::SysvarCache,
         timings::{ExecuteDetailsTimings, ExecuteTimingType, ExecuteTimings},