fix rebase?

Author: avivg-starkware

crates/blockifier/src/execution/casm_hash_estimation.rs

@@ -187,9 +187,12 @@ impl EstimateCasmHashResources for CasmV1HashResourceEstimate {
     }
 }
 
-// TODO(AvivG): Remove allow once used.
-#[allow(unused)]
-struct CasmV2HashResourceEstimate {}
+pub(crate) struct CasmV2HashResourceEstimate {}
+
+impl CasmV2HashResourceEstimate {
+    // Input for Blake hash function is a sequence of 16 `u32` words.
+    pub(crate) const U32_WORDS_PER_MESSAGE: usize = 16;
+}
 
 impl EstimateCasmHashResources for CasmV2HashResourceEstimate {
     fn hash_version(&self) -> HashVersion {

crates/blockifier/src/execution/contract_class.rs

@@ -73,6 +73,12 @@ pub struct FeltSizeCount {
 }
 
 impl FeltSizeCount {
+    // Constants that define how felts are encoded into u32s for BLAKE hashing.
+    // Number of `u32` words a large felt expands into.
+    pub(crate) const U32_WORDS_PER_LARGE_FELT: usize = 8;
+    // Number of `u32` words a small felt expands into.
+    pub(crate) const U32_WORDS_PER_SMALL_FELT: usize = 2;
+
     pub(crate) fn n_felts(&self) -> usize {
         self.small + self.large
     }

crates/blockifier/src/execution/execution_utils.rs

@@ -25,7 +25,10 @@ use starknet_types_core::felt::Felt;
 use crate::blockifier_versioned_constants::VersionedConstants;
 use crate::bouncer::vm_resources_to_sierra_gas;
 use crate::execution::call_info::{CallExecution, CallInfo, Retdata};
-use crate::execution::casm_hash_estimation::EstimatedExecutionResources;
+use crate::execution::casm_hash_estimation::{
+    CasmV2HashResourceEstimate,
+    EstimatedExecutionResources,
+};
 use crate::execution::contract_class::{FeltSizeCount, RunnableCompiledClass, TrackedResource};
 use crate::execution::entry_point::{
     execute_constructor_entry_point,
@@ -373,16 +376,6 @@ pub fn poseidon_hash_many_cost(data_length: usize) -> ExecutionResources {
     }
 }
 
-// Constants that define how felts are encoded into u32s for BLAKE hashing.
-mod blake_encoding {
-    // Number of `u32` words in a single BLAKE input message block.
-    pub(crate) const U32_WORDS_PER_MESSAGE: usize = 16;
-    // Number of `u32` words a large felt expands into.
-    pub(crate) const U32_WORDS_PER_LARGE_FELT: usize = 8;
-    // Number of `u32` words a small felt expands into.
-    pub(crate) const U32_WORDS_PER_SMALL_FELT: usize = 2;
-}
-
 // Constants used for estimating the cost of BLAKE hashing inside Starknet OS.
 // These values are based on empirical measurement by running
 // `encode_felt252_data_and_calc_blake_hash` on various combinations of big and small felts.
@@ -408,16 +401,16 @@ mod blake_estimation {
 /// Big felts encode to 8 u32s each, small felts encode to 2 u32s each.
 fn total_u32s_from_felts(n_big_felts: usize, n_small_felts: usize) -> usize {
     let big_u32s = n_big_felts
-        .checked_mul(blake_encoding::U32_WORDS_PER_LARGE_FELT)
+        .checked_mul(FeltSizeCount::U32_WORDS_PER_LARGE_FELT)
         .expect("Overflow computing big felts u32s");
     let small_u32s = n_small_felts
-        .checked_mul(blake_encoding::U32_WORDS_PER_SMALL_FELT)
+        .checked_mul(FeltSizeCount::U32_WORDS_PER_SMALL_FELT)
         .expect("Overflow computing small felts u32s");
     big_u32s.checked_add(small_u32s).expect("Overflow computing total u32s")
 }
 
 fn base_steps_for_blake_hash(n_u32s: usize) -> usize {
-    let rem_u32s = n_u32s % blake_encoding::U32_WORDS_PER_MESSAGE;
+    let rem_u32s = n_u32s % CasmV2HashResourceEstimate::U32_WORDS_PER_MESSAGE;
     if rem_u32s == 0 {
         blake_estimation::BASE_STEPS_FULL_MSG
     } else {
@@ -461,7 +454,7 @@ fn estimate_steps_of_encode_felt252_data_and_calc_blake_hash(
 fn count_blake_opcode(felt_size_groups: &FeltSizeCount) -> usize {
     // Count the total number of u32s to be hashed.
     let total_u32s = total_u32s_from_felts(felt_size_groups.large, felt_size_groups.small);
-    total_u32s.div_ceil(blake_encoding::U32_WORDS_PER_MESSAGE)
+    total_u32s.div_ceil(CasmV2HashResourceEstimate::U32_WORDS_PER_MESSAGE)
 }
 
 /// Estimates resource usage for `encode_felt252_data_and_calc_blake_hash` in the Starknet OS.

crates/blockifier/src/execution/execution_utils_test.rs

@@ -6,7 +6,6 @@ use starknet_types_core::felt::Felt;
 use crate::execution::contract_class::FeltSizeCount;
 use crate::execution::execution_utils::blake_estimation::STEPS_EMPTY_INPUT;
 use crate::execution::execution_utils::{
-    blake_encoding,
     count_blake_opcode,
     encode_and_blake_hash_resources,
     estimate_steps_of_encode_felt252_data_and_calc_blake_hash,
@@ -23,8 +22,8 @@ fn test_u32_constants() {
     let big_u32s = encode_felts_to_u32s(vec![big_felt]);
 
     // Blake estimation constants should match the actual encoding.
-    assert_eq!(small_u32s.len(), blake_encoding::U32_WORDS_PER_SMALL_FELT);
-    assert_eq!(big_u32s.len(), blake_encoding::U32_WORDS_PER_LARGE_FELT);
+    assert_eq!(small_u32s.len(), FeltSizeCount::U32_WORDS_PER_SMALL_FELT);
+    assert_eq!(big_u32s.len(), FeltSizeCount::U32_WORDS_PER_LARGE_FELT);
 }
 
 /// Test the edge case of hashing an empty array of felt values.