diff --git a/svm/src/account_saver.rs b/runtime/src/account_saver.rs similarity index 99% rename from svm/src/account_saver.rs rename to runtime/src/account_saver.rs index ca3c45dbfd50f3..4875413539107b 100644 --- a/svm/src/account_saver.rs +++ b/runtime/src/account_saver.rs @@ -1,15 +1,15 @@ use { - crate::{ + solana_sdk::{ + account::AccountSharedData, nonce::state::DurableNonce, pubkey::Pubkey, + transaction_context::TransactionAccount, + }, + solana_svm::{ rollback_accounts::RollbackAccounts, transaction_processing_result::{ ProcessedTransaction, TransactionProcessingResult, TransactionProcessingResultExtensions, }, }, - solana_sdk::{ - account::AccountSharedData, nonce::state::DurableNonce, pubkey::Pubkey, - transaction_context::TransactionAccount, - }, solana_svm_transaction::svm_message::SVMMessage, }; @@ -158,11 +158,6 @@ fn collect_accounts_for_failed_tx<'a, T: SVMMessage>( mod tests { use { super::*, - crate::{ - account_loader::{FeesOnlyTransaction, LoadedTransaction}, - nonce_info::NonceInfo, - transaction_execution_result::{ExecutedTransaction, TransactionExecutionDetails}, - }, solana_compute_budget::compute_budget_limits::ComputeBudgetLimits, solana_sdk::{ account::{AccountSharedData, ReadableAccount}, @@ -181,6 +176,11 @@ mod tests { system_instruction, system_program, transaction::{Result, SanitizedTransaction, Transaction, TransactionError}, }, + solana_svm::{ + account_loader::{FeesOnlyTransaction, LoadedTransaction}, + nonce_info::NonceInfo, + transaction_execution_result::{ExecutedTransaction, TransactionExecutionDetails}, + }, std::collections::HashMap, }; diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 040729cd5ebf90..82c3985211220b 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -35,6 +35,7 @@ //! already been signed and verified. use { crate::{ + account_saver::collect_accounts_to_store, bank::{ builtins::{BuiltinPrototype, BUILTINS, STATELESS_BUILTINS}, metrics::*, @@ -154,7 +155,6 @@ use { solana_svm::{ account_loader::{collect_rent_from_account, LoadedTransaction}, account_overrides::AccountOverrides, - account_saver::collect_accounts_to_store, transaction_commit_result::{CommittedTransaction, TransactionCommitResult}, transaction_error_metrics::TransactionErrorMetrics, transaction_execution_result::{ diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index c3772735b9ef42..d066628c717b34 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -4,6 +4,7 @@ #[macro_use] extern crate lazy_static; +mod account_saver; pub mod accounts_background_service; pub mod bank; pub mod bank_client; diff --git a/svm/src/lib.rs b/svm/src/lib.rs index a9686f2cf81da9..f3cbbaa0f9cb18 100644 --- a/svm/src/lib.rs +++ b/svm/src/lib.rs @@ -3,7 +3,6 @@ pub mod account_loader; pub mod account_overrides; -pub mod account_saver; pub mod message_processor; pub mod nonce_info; pub mod program_loader;