pr_comments: fix unwrap_or()

lambdaclass · Nov 13, 2024 · 1bfc720 · 1bfc720
1 parent b876fe2
commit 1bfc720
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/crates/l2/proposer/prover_server.rs b/crates/l2/proposer/prover_server.rs
@@ -309,8 +309,6 @@ impl ProverServer {
 
         let block = Block::new(header, body);
 
-        info!("prover_server {block:?}");
-
         let db = ExecutionDB::from_exec(&block, &self.store).map_err(|err| err.to_string())?;
 
         let parent_header = self

diff --git a/crates/l2/utils/eth_client/mod.rs b/crates/l2/utils/eth_client/mod.rs
@@ -405,9 +405,11 @@ impl EthClient {
                 self.get_chain_id().await?.as_u64()
             },
             nonce: self.get_nonce_from_overrides(&overrides).await?,
-            max_priority_fee_per_gas: overrides
-                .priority_gas_price
-                .unwrap_or(self.get_gas_price().await?.as_u64()),
+            max_priority_fee_per_gas: if let Some(gas_price) = overrides.priority_gas_price {
+                gas_price
+            } else {
+                self.get_gas_price().await?.as_u64()
+            },
             max_fee_per_gas: if let Some(gas_price) = overrides.gas_price {
                 gas_price
             } else {
@@ -464,9 +466,11 @@ impl EthClient {
                 self.get_chain_id().await?.as_u64()
             },
             nonce: self.get_nonce_from_overrides(&overrides).await?,
-            max_priority_fee_per_gas: overrides
-                .priority_gas_price
-                .unwrap_or(self.get_gas_price().await?.as_u64()),
+            max_priority_fee_per_gas: if let Some(gas_price) = overrides.priority_gas_price {
+                gas_price
+            } else {
+                self.get_gas_price().await?.as_u64()
+            },
             max_fee_per_gas: if let Some(gas_price) = overrides.gas_price {
                 gas_price
             } else {
@@ -514,7 +518,11 @@ impl EthClient {
                 self.get_chain_id().await?.as_u64()
             },
             nonce: self.get_nonce_from_overrides(&overrides).await?,
-            max_priority_fee_per_gas: overrides.priority_gas_price.unwrap_or_default(),
+            max_priority_fee_per_gas: if let Some(gas_price) = overrides.priority_gas_price {
+                gas_price
+            } else {
+                self.get_gas_price().await?.as_u64()
+            },
             max_fee_per_gas: if let Some(gas_price) = overrides.gas_price {
                 gas_price
             } else {