account_saver moved to runtime (anza-xyz#2773)

abklabs · Nov 27, 2024 · 633ff9d · 633ff9d
1 parent 5b4c7a5
commit 633ff9d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/svm/src/account_saver.rs → runtime/src/account_saver.rs b/svm/src/account_saver.rs → 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
@@ -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
@@ -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
@@ -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;