fix: rust 1.73.0 fixes

alchemyplatform · Oct 6, 2023 · f1c3f5d · f1c3f5d
1 parent b337dcb
commit f1c3f5d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,6 +4,7 @@ members = [
     "crates/*",
 ]
 default-members = ["bin/rundler"]
+resolver = "2"
 
 [workspace.package]
 version = "0.1.0-beta"

diff --git a/crates/pool/src/chain.rs b/crates/pool/src/chain.rs
@@ -508,8 +508,7 @@ mod tests {
 
         fn get_block_by_hash(&self, hash: H256) -> Option<Block<H256>> {
             let blocks = self.blocks.read();
-            let number = blocks.iter().position(|block| block.hash == hash);
-            let Some(number) = number else { return None };
+            let number = blocks.iter().position(|block| block.hash == hash)?;
             let parent_hash = if number > 0 {
                 blocks[number - 1].hash
             } else {

diff --git a/crates/sim/src/estimation/estimation.rs b/crates/sim/src/estimation/estimation.rs
@@ -256,7 +256,6 @@ impl<P: Provider, E: EntryPoint> GasEstimatorImpl<P, E> {
             guess = (max_failure_gas + min_success_gas) / 2;
         }
 
-        let mut min_success_gas = min_success_gas;
         if op.paymaster().is_none() {
             // If not using a paymaster, add the gas for the gas fee transfer.
             min_success_gas += GAS_FEE_TRANSFER_COST;