sstore_cost return u64 instead of Option

Signed-off-by: jsvisa <[email protected]>
bluealloy · Sep 23, 2024 · b0a5536 · b0a5536
1 parent f078452
commit b0a5536
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/crates/interpreter/src/gas/calc.rs b/crates/interpreter/src/gas/calc.rs
@@ -185,8 +185,8 @@ pub const fn sload_cost(spec_id: SpecId, is_cold: bool) -> u64 {
 
 /// `SSTORE` opcode cost calculation.
 #[inline]
-pub fn sstore_cost(spec_id: SpecId, vals: &SStoreResult, is_cold: bool) -> Option<u64> {
-    Some(if spec_id.is_enabled_in(SpecId::BERLIN) {
+pub fn sstore_cost(spec_id: SpecId, vals: &SStoreResult, is_cold: bool) -> u64 {
+    if spec_id.is_enabled_in(SpecId::BERLIN) {
         // Berlin specification logic
         let mut gas_cost = istanbul_sstore_cost::<WARM_STORAGE_READ_COST, WARM_SSTORE_RESET>(vals);
 
@@ -200,7 +200,7 @@ pub fn sstore_cost(spec_id: SpecId, vals: &SStoreResult, is_cold: bool) -> Optio
     } else {
         // Frontier logic
         frontier_sstore_cost(vals)
-    })
+    }
 }
 
 /// EIP-2200: Structured Definitions for Net Gas Metering

diff --git a/crates/interpreter/src/instructions/host.rs b/crates/interpreter/src/instructions/host.rs
@@ -142,9 +142,7 @@ pub fn sstore<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host:
         interpreter.instruction_result = InstructionResult::ReentrancySentryOOG;
         return;
     }
-    gas_or_fail!(interpreter, {
-        gas::sstore_cost(SPEC::SPEC_ID, &state_load.data, state_load.is_cold)
-    });
+    gas::sstore_cost(SPEC::SPEC_ID, &state_load.data, state_load.is_cold);
     refund!(
         interpreter,
         gas::sstore_refund(SPEC::SPEC_ID, &state_load.data)