fix(static-files): break Arc reference cycle

.config/nextest.toml

@@ -4,4 +4,4 @@ slow-timeout = { period = "30s", terminate-after = 4 }
 
 [[profile.default.overrides]]
 filter = "test(general_state_tests)"
-slow-timeout = { period = "1m", terminate-after = 4 }
+slow-timeout = { period = "1m", terminate-after = 10 }

.github/workflows/unit.yml

@@ -1,21 +1,17 @@
 # Runs unit tests.
 
 name: unit
-
 on:
   pull_request:
   merge_group:
   push:
     branches: [main]
-
 env:
   CARGO_TERM_COLOR: always
   SEED: rustethereumethereumrust
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
-
 jobs:
   test:
     name: test / ${{ matrix.network }} (${{ matrix.partition }}/2)
@@ -42,7 +38,6 @@ jobs:
             --workspace --exclude examples --exclude ef-tests \
             --partition hash:${{ matrix.partition }}/2 \
             -E "kind(lib) | kind(bin) | kind(proc-macro)"
-
   state:
     name: Ethereum state tests
     runs-on:
@@ -65,8 +60,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - run: cargo nextest run --release -p ef-tests --features ef-tests
-
+      - run: cargo nextest run --release -p ef-tests --features ef-tests --nocapture
   doc:
     name: doc tests (${{ matrix.network }})
     runs-on:
@@ -85,7 +79,6 @@ jobs:
           cache-on-failure: true
       - name: Run doctests
         run: cargo test --doc --workspace --features "${{ matrix.network }}"
-
   unit-success:
     name: unit success
     runs-on: ubuntu-latest

crates/stages/src/stages/execution.rs

@@ -557,13 +557,14 @@ where
 
     // Get next expected receipt number in static files
     let static_file_provider = provider.static_file_provider();
-    let mut static_file_producer =
-        static_file_provider.get_writer(start_block, StaticFileSegment::Receipts)?;
-    let next_static_file_receipt_num = static_file_producer
+    let next_static_file_receipt_num = static_file_provider
         .get_highest_static_file_tx(StaticFileSegment::Receipts)
         .map(|num| num + 1)
         .unwrap_or(0);
 
+    let mut static_file_producer =
+        static_file_provider.get_writer(start_block, StaticFileSegment::Receipts)?;
+
     // Check if we had any unexpected shutdown after committing to static files, but
     // NOT committing to database.
     match next_static_file_receipt_num.cmp(&next_receipt_num) {
@@ -587,6 +588,7 @@ where
         }
         Ordering::Equal => {}
     }
+
     Ok(static_file_producer)
 }
 

crates/static-file/src/segments/headers.rs

@@ -65,7 +65,7 @@ impl<DB: Database> Segment<DB> for Headers {
         block_range: RangeInclusive<BlockNumber>,
     ) -> ProviderResult<()> {
         let range_len = block_range.clone().count();
-        let mut jar = prepare_jar::<DB, 3>(
+        let jar = prepare_jar::<DB, 3>(
             provider,
             directory,
             StaticFileSegment::Headers,
@@ -119,7 +119,7 @@ impl<DB: Database> Segment<DB> for Headers {
             None::<Vec<std::vec::IntoIter<Vec<u8>>>>,
             hashes,
             range_len,
-            &mut jar,
+            jar,
         )?;
 
         Ok(())

crates/static-file/src/segments/receipts.rs

@@ -64,7 +64,7 @@ impl<DB: Database> Segment<DB> for Receipts {
         let tx_range = provider.transaction_range_by_block_range(block_range.clone())?;
         let tx_range_len = tx_range.clone().count();
 
-        let mut jar = prepare_jar::<DB, 1>(
+        let jar = prepare_jar::<DB, 1>(
             provider,
             directory,
             StaticFileSegment::Receipts,
@@ -99,7 +99,7 @@ impl<DB: Database> Segment<DB> for Receipts {
             None::<Vec<std::vec::IntoIter<Vec<u8>>>>,
             hashes,
             tx_range_len,
-            &mut jar,
+            jar,
         )?;
 
         Ok(())

crates/static-file/src/segments/transactions.rs

@@ -68,7 +68,7 @@ impl<DB: Database> Segment<DB> for Transactions {
         let tx_range = provider.transaction_range_by_block_range(block_range.clone())?;
         let tx_range_len = tx_range.clone().count();
 
-        let mut jar = prepare_jar::<DB, 1>(
+        let jar = prepare_jar::<DB, 1>(
             provider,
             directory,
             StaticFileSegment::Transactions,
@@ -103,7 +103,7 @@ impl<DB: Database> Segment<DB> for Transactions {
             None::<Vec<std::vec::IntoIter<Vec<u8>>>>,
             hashes,
             tx_range_len,
-            &mut jar,
+            jar,
         )?;
 
         Ok(())

crates/storage/db/src/static_file/generation.rs

@@ -43,7 +43,7 @@ macro_rules! generate_static_file_func {
                     dict_compression_set: Option<Vec<impl Iterator<Item = Vec<u8>>>>,
                     keys: Option<impl Iterator<Item = ColumnResult<impl PHFKey>>>,
                     row_count: usize,
-                    nippy_jar: &mut NippyJar<H>
+                    mut nippy_jar: NippyJar<H>
                 ) -> ProviderResult<()>
                     where K: Key + Copy
                 {
@@ -88,7 +88,7 @@ macro_rules! generate_static_file_func {
 
                     debug!(target: "reth::static_file", jar=?nippy_jar, "Generating static file.");
 
-                    nippy_jar.freeze(col_iterators.into_iter().chain(additional).collect(), row_count as u64)?;
+                    let nippy_jar = nippy_jar.freeze(col_iterators.into_iter().chain(additional).collect(), row_count as u64)?;
 
                     debug!(target: "reth::static_file", jar=?nippy_jar, "Static file generated.");