trivial: rename storage_interface::state_view

In preparation for introducing DbStateView
setwillis · Apr 5, 2022 · 73a00aa · 73a00aa
1 parent 9263d29
commit 73a00aa
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/execution/executor-types/src/lib.rs b/execution/executor-types/src/lib.rs
@@ -37,7 +37,7 @@ use std::{cmp::max, collections::HashMap, sync::Arc};
 use storage_interface::DbReader;
 
 pub use executed_chunk::ExecutedChunk;
-use storage_interface::state_view::VerifiedStateView;
+use storage_interface::verified_state_view::VerifiedStateView;
 
 type SparseMerkleProof = aptos_types::proof::SparseMerkleProof<StateValue>;
 type SparseMerkleTree = scratchpad::SparseMerkleTree<StateValue>;

diff --git a/execution/executor/src/chunk_executor.rs b/execution/executor/src/chunk_executor.rs
@@ -30,7 +30,7 @@ use aptos_vm::VMExecutor;
 use executor_types::{ChunkExecutorTrait, ExecutedChunk, ExecutedTrees, TransactionReplayer};
 use fail::fail_point;
 use std::{marker::PhantomData, sync::Arc};
-use storage_interface::{state_view::VerifiedStateView, DbReaderWriter};
+use storage_interface::{verified_state_view::VerifiedStateView, DbReaderWriter};
 
 pub struct ChunkExecutor<V> {
     db: DbReaderWriter,

diff --git a/execution/executor/src/components/apply_chunk_output.rs b/execution/executor/src/components/apply_chunk_output.rs
@@ -37,7 +37,7 @@ use std::{
     ops::Deref,
     sync::Arc,
 };
-use storage_interface::{state_view::StateCache, DbReader, TreeState};
+use storage_interface::{verified_state_view::StateCache, DbReader, TreeState};
 
 pub struct ApplyChunkOutput;
 

diff --git a/execution/executor/src/components/chunk_output.rs b/execution/executor/src/components/chunk_output.rs
@@ -16,7 +16,7 @@ use aptos_vm::VMExecutor;
 use executor_types::ExecutedChunk;
 use fail::fail_point;
 use std::{collections::HashSet, sync::Arc};
-use storage_interface::state_view::{StateCache, VerifiedStateView};
+use storage_interface::verified_state_view::{StateCache, VerifiedStateView};
 
 pub struct ChunkOutput {
     /// Input transactions.

diff --git a/execution/executor/src/db_bootstrapper.rs b/execution/executor/src/db_bootstrapper.rs
@@ -23,7 +23,9 @@ use aptos_vm::VMExecutor;
 use executor_types::ExecutedChunk;
 use move_core_types::move_resource::MoveResource;
 use std::{collections::btree_map::BTreeMap, sync::Arc};
-use storage_interface::{state_view::VerifiedStateView, DbReaderWriter, DbWriter, TreeState};
+use storage_interface::{
+    verified_state_view::VerifiedStateView, DbReaderWriter, DbWriter, TreeState,
+};
 
 pub fn generate_waypoint<V: VMExecutor>(
     db: &DbReaderWriter,

diff --git a/storage/storage-interface/src/lib.rs b/storage/storage-interface/src/lib.rs
@@ -36,7 +36,7 @@ use thiserror::Error;
 
 #[cfg(any(feature = "testing", feature = "fuzzing"))]
 pub mod mock;
-pub mod state_view;
+pub mod verified_state_view;
 
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct StartupInfo {

diff --git a/storage/storage-interface/src/state_view.rs → ...rage-interface/src/verified_state_view.rs b/storage/storage-interface/src/state_view.rs → ...rage-interface/src/verified_state_view.rs
diff --git a/vm-validator/src/vm_validator.rs b/vm-validator/src/vm_validator.rs
@@ -16,7 +16,7 @@ use aptos_vm::AptosVM;
 use executor::components::apply_chunk_output::IntoLedgerView;
 use fail::fail_point;
 use std::{convert::TryFrom, sync::Arc};
-use storage_interface::{state_view::VerifiedStateView, DbReader};
+use storage_interface::{verified_state_view::VerifiedStateView, DbReader};
 
 #[cfg(test)]
 #[path = "unit_tests/vm_validator_test.rs"]