SVM: Move RuntimeConfig to svm folder (solana-labs#35085)

pgarg66 · Feb 5, 2024 · 3cf5dd2 · 3cf5dd2
1 parent 6570182
commit 3cf5dd2
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 21 deletions.
diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -96,12 +96,12 @@ use {
         bank_forks::BankForks,
         commitment::BlockCommitmentCache,
         prioritization_fee_cache::PrioritizationFeeCache,
-        runtime_config::RuntimeConfig,
         snapshot_archive_info::SnapshotArchiveInfoGetter,
         snapshot_bank_utils::{self, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL},
         snapshot_config::SnapshotConfig,
         snapshot_hash::StartingSnapshotHashes,
         snapshot_utils::{self, clean_orphaned_account_snapshot_dirs},
+        svm::runtime_config::RuntimeConfig,
     },
     solana_sdk::{
         clock::Slot,

diff --git a/core/tests/epoch_accounts_hash.rs b/core/tests/epoch_accounts_hash.rs
@@ -23,11 +23,11 @@ use {
         bank::{epoch_accounts_hash_utils, Bank},
         bank_forks::BankForks,
         genesis_utils::{self, GenesisConfigInfo},
-        runtime_config::RuntimeConfig,
         snapshot_archive_info::SnapshotArchiveInfoGetter,
         snapshot_bank_utils,
         snapshot_config::SnapshotConfig,
         snapshot_utils,
+        svm::runtime_config::RuntimeConfig,
     },
     solana_sdk::{
         clock::Slot,

diff --git a/core/tests/snapshots.rs b/core/tests/snapshots.rs
@@ -25,7 +25,6 @@ use {
         bank::Bank,
         bank_forks::BankForks,
         genesis_utils::{create_genesis_config_with_leader, GenesisConfigInfo},
-        runtime_config::RuntimeConfig,
         snapshot_archive_info::FullSnapshotArchiveInfo,
         snapshot_bank_utils::{self, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL},
         snapshot_config::SnapshotConfig,
@@ -36,6 +35,7 @@ use {
             SnapshotVersion::{self, V1_2_0},
         },
         status_cache::MAX_CACHE_ENTRIES,
+        svm::runtime_config::RuntimeConfig,
     },
     solana_sdk::{
         clock::Slot,

diff --git a/ledger-tool/src/args.rs b/ledger-tool/src/args.rs
@@ -12,7 +12,7 @@ use {
         blockstore_processor::ProcessOptions,
         use_snapshot_archives_at_startup::{self, UseSnapshotArchivesAtStartup},
     },
-    solana_runtime::runtime_config::RuntimeConfig,
+    solana_runtime::svm::runtime_config::RuntimeConfig,
     solana_sdk::clock::Slot,
     std::{
         collections::HashSet,

diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs
@@ -41,7 +41,7 @@ use {
         commitment::VOTE_THRESHOLD_SIZE,
         installed_scheduler_pool::BankWithScheduler,
         prioritization_fee_cache::PrioritizationFeeCache,
-        runtime_config::RuntimeConfig,
+        svm::runtime_config::RuntimeConfig,
         transaction_batch::TransactionBatch,
     },
     solana_sdk::{

diff --git a/program-test/src/lib.rs b/program-test/src/lib.rs
@@ -25,7 +25,7 @@ use {
         bank_forks::BankForks,
         commitment::BlockCommitmentCache,
         genesis_utils::{create_genesis_config_with_leader_ex, GenesisConfigInfo},
-        runtime_config::RuntimeConfig,
+        svm::runtime_config::RuntimeConfig,
     },
     solana_sdk::{
         account::{create_account_shared_data_for_test, Account, AccountSharedData},

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -48,7 +48,6 @@ use {
         epoch_rewards_hasher::hash_rewards_into_partitions,
         epoch_stakes::{EpochStakes, NodeVoteAccounts},
         installed_scheduler_pool::{BankWithScheduler, InstalledSchedulerRwLock},
-        runtime_config::RuntimeConfig,
         serde_snapshot::BankIncrementalSnapshotPersistence,
         snapshot_hash::SnapshotHash,
         stake_account::StakeAccount,
@@ -59,8 +58,11 @@ use {
         },
         stakes::{InvalidCacheEntryReason, Stakes, StakesCache, StakesEnum},
         status_cache::{SlotDelta, StatusCache},
-        svm::transaction_processor::{
-            TransactionBatchProcessor, TransactionLogMessages, TransactionProcessingCallback,
+        svm::{
+            runtime_config::RuntimeConfig,
+            transaction_processor::{
+                TransactionBatchProcessor, TransactionLogMessages, TransactionProcessingCallback,
+            },
         },
         transaction_batch::TransactionBatch,
     },

diff --git a/runtime/src/bank/serde_snapshot.rs b/runtime/src/bank/serde_snapshot.rs
@@ -7,7 +7,6 @@ mod tests {
                 StartBlockHeightAndRewards,
             },
             genesis_utils::activate_all_features,
-            runtime_config::RuntimeConfig,
             serde_snapshot::{
                 reserialize_bank_with_new_accounts_hash, BankIncrementalSnapshotPersistence,
                 SerdeAccountsHash, SerdeIncrementalAccountsHash, SerdeStyle, SnapshotStreams,
@@ -18,6 +17,7 @@ mod tests {
                 StorageAndNextAppendVecId, BANK_SNAPSHOT_PRE_FILENAME_EXTENSION,
             },
             status_cache::StatusCache,
+            svm::runtime_config::RuntimeConfig,
         },
         assert_matches::assert_matches,
         solana_accounts_db::{

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -21,7 +21,6 @@ pub mod non_circulating_supply;
 pub mod prioritization_fee;
 pub mod prioritization_fee_cache;
 pub mod root_bank_cache;
-pub mod runtime_config;
 pub mod serde_snapshot;
 pub mod snapshot_archive_info;
 pub mod snapshot_bank_utils;

diff --git a/runtime/src/serde_snapshot.rs b/runtime/src/serde_snapshot.rs
@@ -3,12 +3,12 @@ use {
         bank::{Bank, BankFieldsToDeserialize, BankRc},
         builtins::BuiltinPrototype,
         epoch_stakes::EpochStakes,
-        runtime_config::RuntimeConfig,
         serde_snapshot::storage::SerializableAccountStorageEntry,
         snapshot_utils::{
             self, SnapshotError, StorageAndNextAppendVecId, BANK_SNAPSHOT_PRE_FILENAME_EXTENSION,
         },
         stakes::Stakes,
+        svm::runtime_config::RuntimeConfig,
     },
     bincode::{self, config::Options, Error},
     log::*,

diff --git a/runtime/src/snapshot_bank_utils.rs b/runtime/src/snapshot_bank_utils.rs
@@ -2,7 +2,6 @@ use {
     crate::{
         bank::{Bank, BankFieldsToDeserialize, BankSlotDelta},
         builtins::BuiltinPrototype,
-        runtime_config::RuntimeConfig,
         serde_snapshot::{
             bank_from_streams, bank_to_stream, fields_from_streams,
             BankIncrementalSnapshotPersistence, SerdeStyle,
@@ -24,6 +23,7 @@ use {
             UnpackedSnapshotsDirAndVersion, VerifySlotDeltasError,
         },
         status_cache,
+        svm::runtime_config::RuntimeConfig,
     },
     bincode::{config::Options, serialize_into},
     log::*,

diff --git a/runtime/src/svm/mod.rs b/runtime/src/svm/mod.rs
@@ -1,4 +1,5 @@
 pub mod account_loader;
 pub mod account_rent_state;
+pub mod runtime_config;
 pub mod transaction_account_state_info;
 pub mod transaction_processor;
diff --git a/runtime/src/runtime_config.rs → runtime/src/svm/runtime_config.rs b/runtime/src/runtime_config.rs → runtime/src/svm/runtime_config.rs
diff --git a/runtime/src/svm/transaction_processor.rs b/runtime/src/svm/transaction_processor.rs
@@ -1,10 +1,7 @@
 use {
-    crate::{
-        runtime_config::RuntimeConfig,
-        svm::{
-            account_loader::load_accounts,
-            transaction_account_state_info::TransactionAccountStateInfo,
-        },
+    crate::svm::{
+        account_loader::load_accounts, runtime_config::RuntimeConfig,
+        transaction_account_state_info::TransactionAccountStateInfo,
     },
     log::debug,
     percentage::Percentage,

diff --git a/test-validator/src/lib.rs b/test-validator/src/lib.rs
@@ -34,7 +34,7 @@ use {
     solana_rpc_client::{nonblocking, rpc_client::RpcClient},
     solana_runtime::{
         bank_forks::BankForks, genesis_utils::create_genesis_config_with_leader_ex,
-        runtime_config::RuntimeConfig, snapshot_config::SnapshotConfig,
+        snapshot_config::SnapshotConfig, svm::runtime_config::RuntimeConfig,
     },
     solana_sdk::{
         account::{Account, AccountSharedData},

diff --git a/validator/src/main.rs b/validator/src/main.rs
@@ -45,10 +45,10 @@ use {
     solana_rpc_client::rpc_client::RpcClient,
     solana_rpc_client_api::config::RpcLeaderScheduleConfig,
     solana_runtime::{
-        runtime_config::RuntimeConfig,
         snapshot_bank_utils::DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
         snapshot_config::{SnapshotConfig, SnapshotUsage},
         snapshot_utils::{self, ArchiveFormat, SnapshotVersion},
+        svm::runtime_config::RuntimeConfig,
     },
     solana_sdk::{
         clock::{Slot, DEFAULT_S_PER_SLOT},