remove lifetime param in storage trait (paradigmxyz#5046)

bin/reth/src/db/diff.rs

@@ -148,9 +148,9 @@ impl Command {
 }
 
 /// Find diffs for a table, then analyzing the result
-fn find_diffs<'a, T: Table>(
-    primary_tx: impl DbTx<'a>,
-    secondary_tx: impl DbTx<'a>,
+fn find_diffs<T: Table>(
+    primary_tx: impl DbTx,
+    secondary_tx: impl DbTx,
     output_dir: impl AsRef<Path>,
 ) -> eyre::Result<()>
 where
@@ -231,9 +231,9 @@ where
 
 /// This diff algorithm is slightly different, it will walk _each_ table, cross-checking for the
 /// element in the other table.
-fn find_diffs_advanced<'a, T: Table>(
-    primary_tx: &impl DbTx<'a>,
-    secondary_tx: &impl DbTx<'a>,
+fn find_diffs_advanced<T: Table>(
+    primary_tx: &impl DbTx,
+    secondary_tx: &impl DbTx,
 ) -> eyre::Result<TableDiffResult<T>>
 where
     T::Value: PartialEq,

crates/snapshot/src/segments/headers.rs

@@ -24,9 +24,9 @@ impl Headers {
     }
 
     // Generates the dataset to train a zstd dictionary with the most recent rows (at most 1000).
-    fn dataset_for_compression<'tx, T: Table<Key = BlockNumber>>(
+    fn dataset_for_compression<T: Table<Key = BlockNumber>>(
         &self,
-        tx: &impl DbTx<'tx>,
+        tx: &impl DbTx,
         range: &RangeInclusive<BlockNumber>,
         range_len: usize,
     ) -> RethResult<Vec<Vec<u8>>> {
@@ -40,11 +40,7 @@ impl Headers {
 }
 
 impl Segment for Headers {
-    fn snapshot<'tx>(
-        &self,
-        tx: &impl DbTx<'tx>,
-        range: RangeInclusive<BlockNumber>,
-    ) -> RethResult<()> {
+    fn snapshot(&self, tx: &impl DbTx, range: RangeInclusive<BlockNumber>) -> RethResult<()> {
         let range_len = range.clone().count();
         let mut jar = prepare_jar::<3, tables::Headers>(
             tx,

crates/snapshot/src/segments/mod.rs

@@ -18,16 +18,12 @@ pub(crate) type Rows<const COLUMNS: usize> = [Vec<Vec<u8>>; COLUMNS];
 /// A segment represents a snapshotting of some portion of the data.
 pub trait Segment {
     /// Snapshot data using the provided range.
-    fn snapshot<'tx>(
-        &self,
-        tx: &impl DbTx<'tx>,
-        range: RangeInclusive<BlockNumber>,
-    ) -> RethResult<()>;
+    fn snapshot(&self, tx: &impl DbTx, range: RangeInclusive<BlockNumber>) -> RethResult<()>;
 }
 
 /// Returns a [`NippyJar`] according to the desired configuration.
-pub(crate) fn prepare_jar<'tx, const COLUMNS: usize, T: Table>(
-    tx: &impl DbTx<'tx>,
+pub(crate) fn prepare_jar<const COLUMNS: usize, T: Table>(
+    tx: &impl DbTx,
     segment: SnapshotSegment,
     filters: Filters,
     compression: Compression,

crates/stages/src/stages/hashing_storage.rs

@@ -620,9 +620,9 @@ mod tests {
                 .map_err(|e| e.into())
         }
 
-        fn insert_storage_entry<'a, TX: DbTxMut<'a>>(
+        fn insert_storage_entry<TX: DbTxMut>(
             &self,
-            tx: &'a TX,
+            tx: &TX,
             tid_address: BlockNumberAddress,
             entry: StorageEntry,
             hash: bool,

crates/stages/src/test_utils/test_db.rs

@@ -198,10 +198,7 @@ impl TestTransaction {
     }
 
     /// Inserts a single [SealedHeader] into the corresponding tables of the headers stage.
-    fn insert_header<'a, TX: DbTxMut<'a> + DbTx<'a>>(
-        tx: &'a TX,
-        header: &SealedHeader,
-    ) -> Result<(), DbError> {
+    fn insert_header<TX: DbTxMut + DbTx>(tx: &TX, header: &SealedHeader) -> Result<(), DbError> {
         tx.put::<tables::CanonicalHeaders>(header.number, header.hash())?;
         tx.put::<tables::HeaderNumbers>(header.hash(), header.number)?;
         tx.put::<tables::Headers>(header.number, header.clone().unseal())