debugging

Author: mediocregopher

crates/cli/commands/src/db/repair_trie.rs

@@ -58,16 +58,16 @@ fn verify_only<N: ProviderNodeTypes>(
     let hashed_cursor_factory = &provider;
     let trie_cursor_factory = &provider;
 
-    {
-        let mut accounts_trie_cursor = trie_cursor_factory.account_trie_cursor()?;
-        let mut accounts_iter = TrieCursorIter::new(&mut accounts_trie_cursor);
-        while let Some(entry) = accounts_iter.next().transpose()? {
-            info!(path=?entry.0, "Accounts entry");
-        }
-        info!("finished iterating over accounts");
-    }
-
-    return Ok(());
+    //{
+    //    let mut accounts_trie_cursor = trie_cursor_factory.account_trie_cursor()?;
+    //    let mut accounts_iter = TrieCursorIter::new(&mut accounts_trie_cursor);
+    //    while let Some(entry) = accounts_iter.next().transpose()? {
+    //        info!(path=?entry.0, "Accounts entry");
+    //    }
+    //    info!("finished iterating over accounts");
+    //}
+
+    //return Ok(());
 
     //let provider = provider_factory.provider()?;
     //let tx = provider.tx_ref();

crates/storage/provider/src/providers/state/overlay.rs

@@ -18,7 +18,7 @@ use reth_trie_db::{
     DatabaseHashedCursorFactory, DatabaseHashedPostState, DatabaseTrieCursorFactory,
 };
 use std::{ops::RangeInclusive, sync::Arc};
-use tracing::{trace};
+use tracing::trace;
 
 /// Factory for creating overlay state providers with optional reverts and overlays.
 ///
@@ -140,7 +140,7 @@ where
     /// Create a read-only [`OverlayStateProvider`].
     fn database_provider_ro(&self) -> Result<OverlayStateProvider<F::Provider>, ProviderError> {
         // Get a read-only provider
-        let provider = self.factory.database_provider_ro()?;
+        let provider = self.factory.database_provider_ro()?.disable_long_read_transaction_safety();
 
         // If block_number is provided, collect reverts
         let (trie_updates, hashed_state) = if let Some(from_block) = self.block_number {

crates/trie/db/src/trie_cursor.rs

@@ -10,7 +10,6 @@ use reth_trie::{
     updates::StorageTrieUpdatesSorted,
     BranchNodeCompact, Nibbles, StorageTrieEntry, StoredNibbles, StoredNibblesSubKey,
 };
-use tracing::info;
 
 /// Wrapper struct for database transaction implementing trie cursor factory trait.
 #[derive(Debug, Clone)]
@@ -73,7 +72,6 @@ where
         key: Nibbles,
     ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
         let res = self.0.seek_exact(StoredNibbles(key))?.map(|value| (value.0 .0, value.1));
-        info!(target: "trie_cursor::db", res=?res.as_ref().map(|v| v.0), ?key, "seek_exact");
         Ok(res)
     }
 
@@ -83,14 +81,12 @@ where
         key: Nibbles,
     ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
         let res = self.0.seek(StoredNibbles(key))?.map(|value| (value.0 .0, value.1));
-        info!(target: "trie_cursor::db", res=?res.as_ref().map(|v| v.0), ?key, "seek");
         Ok(res)
     }
 
     /// Move the cursor to the next entry and return it.
     fn next(&mut self) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
         let res = self.0.next()?.map(|value| (value.0 .0, value.1));
-        info!(target: "trie_cursor::db", res=?res.as_ref().map(|v| v.0), "next");
         Ok(res)
     }