refactor(blockifier): remove WORD_WIDTH from blockifier, use starkn e…

…t_api instead
starkware-libs · Nov 13, 2024 · 7c22e27 · 7c22e27
1 parent 2b4f533
commit 7c22e27
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/crates/blockifier/src/fee/eth_gas_constants.rs b/crates/blockifier/src/fee/eth_gas_constants.rs
@@ -1,8 +1,8 @@
+use starknet_api::core::WORD_WIDTH;
+
 // Calldata.
 pub const GAS_PER_MEMORY_ZERO_BYTE: usize = 4;
 pub const GAS_PER_MEMORY_BYTE: usize = 16;
-// TODO(AvivG): use starknet_api::core::WORD_WIDTH instead.
-pub const WORD_WIDTH: usize = 32;
 pub const GAS_PER_MEMORY_WORD: usize = GAS_PER_MEMORY_BYTE * WORD_WIDTH;
 
 // Blob Data.

diff --git a/crates/blockifier/src/fee/receipt_test.rs b/crates/blockifier/src/fee/receipt_test.rs
@@ -1,4 +1,5 @@
 use rstest::{fixture, rstest};
+use starknet_api::core::WORD_WIDTH;
 use starknet_api::execution_resources::GasVector;
 use starknet_api::transaction::fields::GasVectorComputationMode;
 use starknet_api::transaction::L2ToL1Payload;
@@ -85,8 +86,7 @@ fn test_calculate_tx_gas_usage_basic<'a>(
             .gas_per_code_byte;
         let code_gas_cost = (gas_per_code_byte
             * u64_from_usize(
-                (class_info.bytecode_length() + class_info.sierra_program_length())
-                    * eth_gas_constants::WORD_WIDTH
+                (class_info.bytecode_length() + class_info.sierra_program_length()) * WORD_WIDTH
                     + class_info.abi_length(),
             ))
         .to_integer()

diff --git a/crates/starknet_api/src/contract_class.rs b/crates/starknet_api/src/contract_class.rs
@@ -1,10 +1,13 @@
 use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
 use serde::{Deserialize, Serialize};
 
-use crate::core::{CompiledClassHash, WORD_WIDTH};
+use crate::core::CompiledClassHash;
 use crate::deprecated_contract_class::ContractClass as DeprecatedContractClass;
 use crate::StarknetApiError;
 
+/// One Felt fits into 32 bytes.
+pub const FELT_WIDTH: usize = 32;
+
 #[derive(
     Debug, Default, Clone, Copy, Eq, PartialEq, Hash, Deserialize, Serialize, PartialOrd, Ord,
 )]
@@ -73,7 +76,7 @@ impl ClassInfo {
     pub fn code_size(&self) -> usize {
         (self.bytecode_length() + self.sierra_program_length())
             // We assume each felt is a word.
-            * WORD_WIDTH
+            * FELT_WIDTH
             + self.abi_length()
     }
 

diff --git a/crates/starknet_api/src/core.rs b/crates/starknet_api/src/core.rs
@@ -17,7 +17,7 @@ use crate::transaction::fields::{Calldata, ContractAddressSalt};
 use crate::{impl_from_through_intermediate, StarknetApiError};
 
 // Ethereum constant.
-/// One Felt fits into 32 bytes.
+/// Word size in Ethereum.
 pub const WORD_WIDTH: usize = 32;
 
 /// Felt.