fixup! Merge branch 'tomas/refactor-state' (#2606)

anoma · Feb 23, 2024 · d41e737 · d41e737
1 parent 903281e
commit d41e737
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/crates/apps/src/lib/node/ledger/shell/mod.rs b/crates/apps/src/lib/node/ledger/shell/mod.rs
@@ -637,12 +637,12 @@ where
     pub fn commit(&mut self) -> response::Commit {
         self.bump_last_processed_eth_block();
 
-        self.wl_storage
+        self.state
             .commit_block()
             .expect("Encountered a storage error while committing a block");
 
-        let merkle_root = self.wl_storage.storage.merkle_root();
-        let committed_height = self.wl_storage.storage.get_last_block_height();
+        let merkle_root = self.state.in_mem().merkle_root();
+        let committed_height = self.state.in_mem().get_last_block_height();
         tracing::info!(
             "Committed block hash: {merkle_root}, height: {committed_height}",
         );

diff --git a/crates/sdk/src/queries/shell.rs b/crates/sdk/src/queries/shell.rs
@@ -349,8 +349,8 @@ where
     D: 'static + DB + for<'iter> DBIter<'iter> + Sync,
     H: 'static + StorageHasher + Sync,
 {
-    ctx.wl_storage
-        .storage
+    ctx.state
+        .in_mem()
         .block
         .pred_epochs
         .first_block_heights

diff --git a/crates/tests/src/integration/masp.rs b/crates/tests/src/integration/masp.rs
@@ -1963,8 +1963,8 @@ fn multiple_unfetched_txs_same_block() -> Result<()> {
         .shell
         .lock()
         .unwrap()
-        .wl_storage
-        .storage
+        .state
+        .in_mem()
         .native_token
         .clone();
     let mut txs = vec![];