enha: tidying rocksdb - don't store log index

cloudwalk · Dec 10, 2024 · dc8335f · dc8335f
1 parent bf1ce28
commit dc8335f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/eth/storage/permanent/rocks/rocks_state.rs b/src/eth/storage/permanent/rocks/rocks_state.rs
@@ -301,8 +301,8 @@ impl RocksStorageState {
             let logs = block
                 .transactions
                 .into_iter()
-                .flat_map(|transaction| transaction.logs)
-                .map(|log| LogMined::from_rocks_primitives(log, block.header.number, block.header.hash));
+                .flat_map(|transaction| transaction.logs.into_iter().enumerate())
+                .map(|(index, log)| LogMined::from_rocks_primitives(log, block.header.number, block.header.hash, index));
 
             let filtered_logs = logs.filter(|log| filter.matches(log));
             logs_result.extend(filtered_logs);

diff --git a/src/eth/storage/permanent/rocks/types/log_mined.rs b/src/eth/storage/permanent/rocks/types/log_mined.rs
@@ -4,14 +4,14 @@ use super::block_number::BlockNumberRocksdb;
 use super::hash::HashRocksdb;
 use super::index::IndexRocksdb;
 use super::log::LogRocksdb;
+use crate::eth::primitives::Index;
 use crate::eth::primitives::LogMined;
 
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize, fake::Dummy)]
 pub struct LogMinedRocksdb {
     pub log: LogRocksdb,
     pub transaction_hash: HashRocksdb,
     pub transaction_index: IndexRocksdb,
-    pub log_index: IndexRocksdb,
 }
 
 impl From<LogMined> for LogMinedRocksdb {
@@ -20,20 +20,19 @@ impl From<LogMined> for LogMinedRocksdb {
             log: item.log.into(),
             transaction_hash: item.transaction_hash.into(),
             transaction_index: item.transaction_index.into(),
-            log_index: item.log_index.into(),
         }
     }
 }
 
 impl LogMined {
-    pub fn from_rocks_primitives(other: LogMinedRocksdb, block_number: BlockNumberRocksdb, block_hash: HashRocksdb) -> Self {
+    pub fn from_rocks_primitives(other: LogMinedRocksdb, block_number: BlockNumberRocksdb, block_hash: HashRocksdb, index: usize) -> Self {
         Self {
             block_number: block_number.into(),
             block_hash: block_hash.into(),
             log: other.log.into(),
             transaction_hash: other.transaction_hash.into(),
             transaction_index: other.transaction_index.into(),
-            log_index: other.log_index.into(),
+            log_index: Index::from(index as u64),
         }
     }
 }
diff --git a/src/eth/storage/permanent/rocks/types/transaction_mined.rs b/src/eth/storage/permanent/rocks/types/transaction_mined.rs
@@ -36,7 +36,8 @@ impl TransactionMined {
             logs: other
                 .logs
                 .into_iter()
-                .map(|log| LogMined::from_rocks_primitives(log, block_number, block_hash))
+                .enumerate()
+                .map(|(log_index, log)| LogMined::from_rocks_primitives(log, block_number, block_hash, log_index))
                 .collect(),
             transaction_index: Index::from(index as u64),
         }