[mempool] share state view between get_account_sequence_nummber() calls

Author: msmouse

mempool/src/shared_mempool/tasks.rs

@@ -36,6 +36,7 @@ use std::{
     sync::Arc,
     time::{Duration, Instant},
 };
+use storage_interface::state_view::LatestDbStateCheckpointView;
 use tokio::runtime::Handle;
 use vm_validator::vm_validator::{get_account_sequence_number, TransactionValidation};
 
@@ -235,12 +236,17 @@ where
     let mut statuses = vec![];
 
     let start_storage_read = Instant::now();
+    let state_view = smp
+        .db
+        .latest_state_checkpoint_view()
+        .expect("Failed to get latest state checkpoint view.");
+
     // Track latency: fetching seq number
     let seq_numbers = IO_POOL.install(|| {
         transactions
             .par_iter()
             .map(|t| {
-                get_account_sequence_number(smp.db.clone(), t.sender()).map_err(|e| {
+                get_account_sequence_number(&state_view, t.sender()).map_err(|e| {
                     error!(LogSchema::new(LogEntry::DBError).error(&e));
                     counters::DB_ERROR.inc();
                     e

vm-validator/src/unit_tests/vm_validator_test.rs

@@ -18,6 +18,7 @@ use move_deps::move_core_types::{
     gas_schedule::{GasAlgebra, GasConstants},
 };
 use rand::SeedableRng;
+use storage_interface::state_view::LatestDbStateCheckpointView;
 use storage_interface::DbReaderWriter;
 
 const MAX_TRANSACTION_SIZE_IN_BYTES: u64 = 262144;
@@ -202,15 +203,20 @@ fn test_validate_max_gas_units_below_min() {
 fn test_get_account_sequence_number() {
     let vm_validator = TestValidator::new();
     let root_address = account_config::aptos_root_address();
+    let state_view = vm_validator
+        .vm_validator
+        .db_reader
+        .latest_state_checkpoint_view()
+        .unwrap();
     assert_eq!(
-        get_account_sequence_number(vm_validator.vm_validator.db_reader.clone(), root_address,)
+        get_account_sequence_number(&state_view, root_address,)
             .unwrap()
             .min_seq(),
         0
     );
     assert_eq!(
         get_account_sequence_number(
-            vm_validator.vm_validator.db_reader,
+            &state_view,
             AccountAddress::new([5u8; AccountAddress::LENGTH]),
         )
         .unwrap()

vm-validator/src/vm_validator.rs

@@ -13,6 +13,7 @@ use aptos_types::{
 use aptos_vm::AptosVM;
 use fail::fail_point;
 use std::sync::Arc;
+use storage_interface::state_view::DbStateView;
 use storage_interface::{
     cached_state_view::CachedDbStateView, state_view::LatestDbStateCheckpointView, DbReader,
 };
@@ -93,17 +94,16 @@ impl TransactionValidation for VMValidator {
 
 /// returns account's sequence number from storage
 pub fn get_account_sequence_number(
-    storage: Arc<dyn DbReader>,
+    state_view: &DbStateView,
     address: AccountAddress,
 ) -> Result<AccountSequenceInfo> {
     fail_point!("vm_validator::get_account_sequence_number", |_| {
         Err(anyhow::anyhow!(
             "Injected error in get_account_sequence_number"
         ))
     });
-    let db_state_view = storage.latest_state_checkpoint_view()?;
 
-    let account_state_view = db_state_view.as_account_with_state_view(&address);
+    let account_state_view = state_view.as_account_with_state_view(&address);
 
     if let Ok(Some(crsn)) = account_state_view.get_crsn_resource() {
         return Ok(AccountSequenceInfo::CRSN {