SVM: Move RuntimeConfig to svm folder (#35085)
This commit is contained in:
parent
65701820f3
commit
3cf5dd2afb
|
@ -96,12 +96,12 @@ use {
|
||||||
bank_forks::BankForks,
|
bank_forks::BankForks,
|
||||||
commitment::BlockCommitmentCache,
|
commitment::BlockCommitmentCache,
|
||||||
prioritization_fee_cache::PrioritizationFeeCache,
|
prioritization_fee_cache::PrioritizationFeeCache,
|
||||||
runtime_config::RuntimeConfig,
|
|
||||||
snapshot_archive_info::SnapshotArchiveInfoGetter,
|
snapshot_archive_info::SnapshotArchiveInfoGetter,
|
||||||
snapshot_bank_utils::{self, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL},
|
snapshot_bank_utils::{self, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL},
|
||||||
snapshot_config::SnapshotConfig,
|
snapshot_config::SnapshotConfig,
|
||||||
snapshot_hash::StartingSnapshotHashes,
|
snapshot_hash::StartingSnapshotHashes,
|
||||||
snapshot_utils::{self, clean_orphaned_account_snapshot_dirs},
|
snapshot_utils::{self, clean_orphaned_account_snapshot_dirs},
|
||||||
|
svm::runtime_config::RuntimeConfig,
|
||||||
},
|
},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
clock::Slot,
|
clock::Slot,
|
||||||
|
|
|
@ -23,11 +23,11 @@ use {
|
||||||
bank::{epoch_accounts_hash_utils, Bank},
|
bank::{epoch_accounts_hash_utils, Bank},
|
||||||
bank_forks::BankForks,
|
bank_forks::BankForks,
|
||||||
genesis_utils::{self, GenesisConfigInfo},
|
genesis_utils::{self, GenesisConfigInfo},
|
||||||
runtime_config::RuntimeConfig,
|
|
||||||
snapshot_archive_info::SnapshotArchiveInfoGetter,
|
snapshot_archive_info::SnapshotArchiveInfoGetter,
|
||||||
snapshot_bank_utils,
|
snapshot_bank_utils,
|
||||||
snapshot_config::SnapshotConfig,
|
snapshot_config::SnapshotConfig,
|
||||||
snapshot_utils,
|
snapshot_utils,
|
||||||
|
svm::runtime_config::RuntimeConfig,
|
||||||
},
|
},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
clock::Slot,
|
clock::Slot,
|
||||||
|
|
|
@ -25,7 +25,6 @@ use {
|
||||||
bank::Bank,
|
bank::Bank,
|
||||||
bank_forks::BankForks,
|
bank_forks::BankForks,
|
||||||
genesis_utils::{create_genesis_config_with_leader, GenesisConfigInfo},
|
genesis_utils::{create_genesis_config_with_leader, GenesisConfigInfo},
|
||||||
runtime_config::RuntimeConfig,
|
|
||||||
snapshot_archive_info::FullSnapshotArchiveInfo,
|
snapshot_archive_info::FullSnapshotArchiveInfo,
|
||||||
snapshot_bank_utils::{self, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL},
|
snapshot_bank_utils::{self, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL},
|
||||||
snapshot_config::SnapshotConfig,
|
snapshot_config::SnapshotConfig,
|
||||||
|
@ -36,6 +35,7 @@ use {
|
||||||
SnapshotVersion::{self, V1_2_0},
|
SnapshotVersion::{self, V1_2_0},
|
||||||
},
|
},
|
||||||
status_cache::MAX_CACHE_ENTRIES,
|
status_cache::MAX_CACHE_ENTRIES,
|
||||||
|
svm::runtime_config::RuntimeConfig,
|
||||||
},
|
},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
clock::Slot,
|
clock::Slot,
|
||||||
|
|
|
@ -12,7 +12,7 @@ use {
|
||||||
blockstore_processor::ProcessOptions,
|
blockstore_processor::ProcessOptions,
|
||||||
use_snapshot_archives_at_startup::{self, UseSnapshotArchivesAtStartup},
|
use_snapshot_archives_at_startup::{self, UseSnapshotArchivesAtStartup},
|
||||||
},
|
},
|
||||||
solana_runtime::runtime_config::RuntimeConfig,
|
solana_runtime::svm::runtime_config::RuntimeConfig,
|
||||||
solana_sdk::clock::Slot,
|
solana_sdk::clock::Slot,
|
||||||
std::{
|
std::{
|
||||||
collections::HashSet,
|
collections::HashSet,
|
||||||
|
|
|
@ -41,7 +41,7 @@ use {
|
||||||
commitment::VOTE_THRESHOLD_SIZE,
|
commitment::VOTE_THRESHOLD_SIZE,
|
||||||
installed_scheduler_pool::BankWithScheduler,
|
installed_scheduler_pool::BankWithScheduler,
|
||||||
prioritization_fee_cache::PrioritizationFeeCache,
|
prioritization_fee_cache::PrioritizationFeeCache,
|
||||||
runtime_config::RuntimeConfig,
|
svm::runtime_config::RuntimeConfig,
|
||||||
transaction_batch::TransactionBatch,
|
transaction_batch::TransactionBatch,
|
||||||
},
|
},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
|
|
|
@ -25,7 +25,7 @@ use {
|
||||||
bank_forks::BankForks,
|
bank_forks::BankForks,
|
||||||
commitment::BlockCommitmentCache,
|
commitment::BlockCommitmentCache,
|
||||||
genesis_utils::{create_genesis_config_with_leader_ex, GenesisConfigInfo},
|
genesis_utils::{create_genesis_config_with_leader_ex, GenesisConfigInfo},
|
||||||
runtime_config::RuntimeConfig,
|
svm::runtime_config::RuntimeConfig,
|
||||||
},
|
},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
account::{create_account_shared_data_for_test, Account, AccountSharedData},
|
account::{create_account_shared_data_for_test, Account, AccountSharedData},
|
||||||
|
|
|
@ -48,7 +48,6 @@ use {
|
||||||
epoch_rewards_hasher::hash_rewards_into_partitions,
|
epoch_rewards_hasher::hash_rewards_into_partitions,
|
||||||
epoch_stakes::{EpochStakes, NodeVoteAccounts},
|
epoch_stakes::{EpochStakes, NodeVoteAccounts},
|
||||||
installed_scheduler_pool::{BankWithScheduler, InstalledSchedulerRwLock},
|
installed_scheduler_pool::{BankWithScheduler, InstalledSchedulerRwLock},
|
||||||
runtime_config::RuntimeConfig,
|
|
||||||
serde_snapshot::BankIncrementalSnapshotPersistence,
|
serde_snapshot::BankIncrementalSnapshotPersistence,
|
||||||
snapshot_hash::SnapshotHash,
|
snapshot_hash::SnapshotHash,
|
||||||
stake_account::StakeAccount,
|
stake_account::StakeAccount,
|
||||||
|
@ -59,8 +58,11 @@ use {
|
||||||
},
|
},
|
||||||
stakes::{InvalidCacheEntryReason, Stakes, StakesCache, StakesEnum},
|
stakes::{InvalidCacheEntryReason, Stakes, StakesCache, StakesEnum},
|
||||||
status_cache::{SlotDelta, StatusCache},
|
status_cache::{SlotDelta, StatusCache},
|
||||||
svm::transaction_processor::{
|
svm::{
|
||||||
TransactionBatchProcessor, TransactionLogMessages, TransactionProcessingCallback,
|
runtime_config::RuntimeConfig,
|
||||||
|
transaction_processor::{
|
||||||
|
TransactionBatchProcessor, TransactionLogMessages, TransactionProcessingCallback,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
transaction_batch::TransactionBatch,
|
transaction_batch::TransactionBatch,
|
||||||
},
|
},
|
||||||
|
|
|
@ -7,7 +7,6 @@ mod tests {
|
||||||
StartBlockHeightAndRewards,
|
StartBlockHeightAndRewards,
|
||||||
},
|
},
|
||||||
genesis_utils::activate_all_features,
|
genesis_utils::activate_all_features,
|
||||||
runtime_config::RuntimeConfig,
|
|
||||||
serde_snapshot::{
|
serde_snapshot::{
|
||||||
reserialize_bank_with_new_accounts_hash, BankIncrementalSnapshotPersistence,
|
reserialize_bank_with_new_accounts_hash, BankIncrementalSnapshotPersistence,
|
||||||
SerdeAccountsHash, SerdeIncrementalAccountsHash, SerdeStyle, SnapshotStreams,
|
SerdeAccountsHash, SerdeIncrementalAccountsHash, SerdeStyle, SnapshotStreams,
|
||||||
|
@ -18,6 +17,7 @@ mod tests {
|
||||||
StorageAndNextAppendVecId, BANK_SNAPSHOT_PRE_FILENAME_EXTENSION,
|
StorageAndNextAppendVecId, BANK_SNAPSHOT_PRE_FILENAME_EXTENSION,
|
||||||
},
|
},
|
||||||
status_cache::StatusCache,
|
status_cache::StatusCache,
|
||||||
|
svm::runtime_config::RuntimeConfig,
|
||||||
},
|
},
|
||||||
assert_matches::assert_matches,
|
assert_matches::assert_matches,
|
||||||
solana_accounts_db::{
|
solana_accounts_db::{
|
||||||
|
|
|
@ -21,7 +21,6 @@ pub mod non_circulating_supply;
|
||||||
pub mod prioritization_fee;
|
pub mod prioritization_fee;
|
||||||
pub mod prioritization_fee_cache;
|
pub mod prioritization_fee_cache;
|
||||||
pub mod root_bank_cache;
|
pub mod root_bank_cache;
|
||||||
pub mod runtime_config;
|
|
||||||
pub mod serde_snapshot;
|
pub mod serde_snapshot;
|
||||||
pub mod snapshot_archive_info;
|
pub mod snapshot_archive_info;
|
||||||
pub mod snapshot_bank_utils;
|
pub mod snapshot_bank_utils;
|
||||||
|
|
|
@ -3,12 +3,12 @@ use {
|
||||||
bank::{Bank, BankFieldsToDeserialize, BankRc},
|
bank::{Bank, BankFieldsToDeserialize, BankRc},
|
||||||
builtins::BuiltinPrototype,
|
builtins::BuiltinPrototype,
|
||||||
epoch_stakes::EpochStakes,
|
epoch_stakes::EpochStakes,
|
||||||
runtime_config::RuntimeConfig,
|
|
||||||
serde_snapshot::storage::SerializableAccountStorageEntry,
|
serde_snapshot::storage::SerializableAccountStorageEntry,
|
||||||
snapshot_utils::{
|
snapshot_utils::{
|
||||||
self, SnapshotError, StorageAndNextAppendVecId, BANK_SNAPSHOT_PRE_FILENAME_EXTENSION,
|
self, SnapshotError, StorageAndNextAppendVecId, BANK_SNAPSHOT_PRE_FILENAME_EXTENSION,
|
||||||
},
|
},
|
||||||
stakes::Stakes,
|
stakes::Stakes,
|
||||||
|
svm::runtime_config::RuntimeConfig,
|
||||||
},
|
},
|
||||||
bincode::{self, config::Options, Error},
|
bincode::{self, config::Options, Error},
|
||||||
log::*,
|
log::*,
|
||||||
|
|
|
@ -2,7 +2,6 @@ use {
|
||||||
crate::{
|
crate::{
|
||||||
bank::{Bank, BankFieldsToDeserialize, BankSlotDelta},
|
bank::{Bank, BankFieldsToDeserialize, BankSlotDelta},
|
||||||
builtins::BuiltinPrototype,
|
builtins::BuiltinPrototype,
|
||||||
runtime_config::RuntimeConfig,
|
|
||||||
serde_snapshot::{
|
serde_snapshot::{
|
||||||
bank_from_streams, bank_to_stream, fields_from_streams,
|
bank_from_streams, bank_to_stream, fields_from_streams,
|
||||||
BankIncrementalSnapshotPersistence, SerdeStyle,
|
BankIncrementalSnapshotPersistence, SerdeStyle,
|
||||||
|
@ -24,6 +23,7 @@ use {
|
||||||
UnpackedSnapshotsDirAndVersion, VerifySlotDeltasError,
|
UnpackedSnapshotsDirAndVersion, VerifySlotDeltasError,
|
||||||
},
|
},
|
||||||
status_cache,
|
status_cache,
|
||||||
|
svm::runtime_config::RuntimeConfig,
|
||||||
},
|
},
|
||||||
bincode::{config::Options, serialize_into},
|
bincode::{config::Options, serialize_into},
|
||||||
log::*,
|
log::*,
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
pub mod account_loader;
|
pub mod account_loader;
|
||||||
pub mod account_rent_state;
|
pub mod account_rent_state;
|
||||||
|
pub mod runtime_config;
|
||||||
pub mod transaction_account_state_info;
|
pub mod transaction_account_state_info;
|
||||||
pub mod transaction_processor;
|
pub mod transaction_processor;
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
use {
|
use {
|
||||||
crate::{
|
crate::svm::{
|
||||||
runtime_config::RuntimeConfig,
|
account_loader::load_accounts, runtime_config::RuntimeConfig,
|
||||||
svm::{
|
transaction_account_state_info::TransactionAccountStateInfo,
|
||||||
account_loader::load_accounts,
|
|
||||||
transaction_account_state_info::TransactionAccountStateInfo,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
log::debug,
|
log::debug,
|
||||||
percentage::Percentage,
|
percentage::Percentage,
|
||||||
|
|
|
@ -34,7 +34,7 @@ use {
|
||||||
solana_rpc_client::{nonblocking, rpc_client::RpcClient},
|
solana_rpc_client::{nonblocking, rpc_client::RpcClient},
|
||||||
solana_runtime::{
|
solana_runtime::{
|
||||||
bank_forks::BankForks, genesis_utils::create_genesis_config_with_leader_ex,
|
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::{
|
solana_sdk::{
|
||||||
account::{Account, AccountSharedData},
|
account::{Account, AccountSharedData},
|
||||||
|
|
|
@ -45,10 +45,10 @@ use {
|
||||||
solana_rpc_client::rpc_client::RpcClient,
|
solana_rpc_client::rpc_client::RpcClient,
|
||||||
solana_rpc_client_api::config::RpcLeaderScheduleConfig,
|
solana_rpc_client_api::config::RpcLeaderScheduleConfig,
|
||||||
solana_runtime::{
|
solana_runtime::{
|
||||||
runtime_config::RuntimeConfig,
|
|
||||||
snapshot_bank_utils::DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
|
snapshot_bank_utils::DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
|
||||||
snapshot_config::{SnapshotConfig, SnapshotUsage},
|
snapshot_config::{SnapshotConfig, SnapshotUsage},
|
||||||
snapshot_utils::{self, ArchiveFormat, SnapshotVersion},
|
snapshot_utils::{self, ArchiveFormat, SnapshotVersion},
|
||||||
|
svm::runtime_config::RuntimeConfig,
|
||||||
},
|
},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
clock::{Slot, DEFAULT_S_PER_SLOT},
|
clock::{Slot, DEFAULT_S_PER_SLOT},
|
||||||
|
|
Loading…
Reference in New Issue