Create SVM folder as a placeholder for the relevant code (#34942)

solana-labs · Jan 25, 2024 · b161f6c · b161f6c
1 parent b04765f
commit b161f6c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/core/src/banking_stage/consumer.rs b/core/src/banking_stage/consumer.rs
@@ -23,8 +23,8 @@ use {
         compute_budget_processor::process_compute_budget_instructions, timings::ExecuteTimings,
     },
     solana_runtime::{
-        accounts::validate_fee_payer,
         bank::{Bank, LoadAndExecuteTransactionsOutput},
+        svm::account_loader::validate_fee_payer,
         transaction_batch::TransactionBatch,
     },
     solana_sdk::{

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -59,6 +59,7 @@ use {
         },
         stakes::{InvalidCacheEntryReason, Stakes, StakesCache, StakesEnum},
         status_cache::{SlotDelta, StatusCache},
+        svm::account_loader::load_accounts,
         transaction_batch::TransactionBatch,
     },
     byteorder::{ByteOrder, LittleEndian},
@@ -282,7 +283,6 @@ pub struct BankRc {
     pub(crate) bank_id_generator: Arc<AtomicU64>,
 }
 
-use crate::accounts::load_accounts;
 #[cfg(RUSTC_WITH_SPECIALIZATION)]
 use solana_frozen_abi::abi_example::AbiExample;
 

diff --git a/runtime/src/bank/fee_distribution.rs b/runtime/src/bank/fee_distribution.rs
@@ -1,6 +1,6 @@
 use {
     super::Bank,
-    crate::accounts::account_rent_state::RentState,
+    crate::svm::account_rent_state::RentState,
     log::{debug, warn},
     solana_accounts_db::stake_rewards::RewardInfo,
     solana_sdk::{

diff --git a/runtime/src/bank/transaction_account_state_info.rs b/runtime/src/bank/transaction_account_state_info.rs
@@ -1,5 +1,5 @@
 use {
-    crate::{accounts::account_rent_state::RentState, bank::Bank},
+    crate::{bank::Bank, svm::account_rent_state::RentState},
     solana_sdk::{
         account::ReadableAccount,
         message::SanitizedMessage,

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -4,7 +4,6 @@
 #[macro_use]
 extern crate lazy_static;
 
-pub mod accounts;
 pub mod accounts_background_service;
 pub mod bank;
 pub mod bank_client;
@@ -37,6 +36,7 @@ pub mod stake_weighted_timestamp;
 pub mod stakes;
 pub mod static_ids;
 pub mod status_cache;
+pub mod svm;
 pub mod transaction_batch;
 pub mod transaction_priority_details;
 

diff --git a/runtime/src/accounts/mod.rs → runtime/src/svm/account_loader.rs b/runtime/src/accounts/mod.rs → runtime/src/svm/account_loader.rs
@@ -1,7 +1,5 @@
-pub mod account_rent_state;
-
 use {
-    crate::{accounts::account_rent_state::RentState, bank::RewardInterval},
+    crate::{bank::RewardInterval, svm::account_rent_state::RentState},
     itertools::Itertools,
     log::warn,
     solana_accounts_db::{
@@ -42,7 +40,7 @@ use {
 };
 
 #[allow(clippy::too_many_arguments)]
-pub(super) fn load_accounts(
+pub(crate) fn load_accounts(
     accounts_db: &AccountsDb,
     ancestors: &Ancestors,
     txs: &[SanitizedTransaction],

diff --git a/runtime/src/accounts/account_rent_state.rs → runtime/src/svm/account_rent_state.rs b/runtime/src/accounts/account_rent_state.rs → runtime/src/svm/account_rent_state.rs
diff --git a/runtime/src/svm/mod.rs b/runtime/src/svm/mod.rs
@@ -0,0 +1,2 @@
+pub mod account_loader;
+pub mod account_rent_state;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		pub mod account_loader;
		pub mod account_rent_state;