Remove --locked flag from nextest

paradigmxyz · Jun 17, 2024 · 192ca90 · 192ca90
1 parent 0b8c131
commit 192ca90
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 26 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -40,14 +40,14 @@ jobs:
         name: Run tests
         run: |
           cargo nextest run \
-            --locked --features "asm-keccak ${{ matrix.network }}" \
+            --features "asm-keccak ${{ matrix.network }}" \
             --workspace --exclude examples --exclude ef-tests \
             -E "kind(test)"
       - if: matrix.network == 'optimism'
         name: Run tests
         run: |
           cargo nextest run \
-            --locked -p reth-node-optimism --features "optimism"
+            -p reth-node-optimism --features "optimism"
 
   sync:
     name: sync / 100k blocks

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Run tests
         run: |
           cargo nextest run \
-            --locked --features "asm-keccak ${{ matrix.network }}" \
+            --features "asm-keccak ${{ matrix.network }}" \
             --workspace --exclude examples --exclude ef-tests \
             --partition hash:${{ matrix.partition }}/2 \
             -E "!kind(test)"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rpc/rpc-eth-api/src/api/servers/helpers/traits/pending_block.rs b/crates/rpc/rpc-eth-api/src/api/servers/helpers/traits/pending_block.rs
@@ -184,7 +184,6 @@ pub trait LoadPendingBlock {
     /// Calculates receipts root in block building.
     ///
     /// Panics if block is not in the [`ExecutionOutcome`]'s block range.
-    #[cfg(not(feature = "optimism"))]
     fn receipts_root(
         &self,
         _block_env: &BlockEnv,
@@ -194,25 +193,6 @@ pub trait LoadPendingBlock {
         execution_outcome.receipts_root_slow(block_number).expect("Block is present")
     }
 
-    /// Calculates receipts root in block building.
-    ///
-    /// Panics if block is not in the [`ExecutionOutcome`]'s block range.
-    #[cfg(feature = "optimism")]
-    fn receipts_root(
-        &self,
-        _block_env: &BlockEnv,
-        execution_outcome: &ExecutionOutcome,
-        block_number: BlockNumber,
-    ) -> B256 {
-        execution_outcome
-            .optimism_receipts_root_slow(
-                block_number,
-                self.provider().chain_spec().as_ref(),
-                _block_env.timestamp.to::<u64>(),
-            )
-            .expect("Block is present")
-    }
-
     /// Builds a pending block using the configured provider and pool.
     ///
     /// If the origin is the actual pending block, the block is built with withdrawals.