fix build after merge

Author: Oppen

bench_vs/lambda/recursion/Cargo.lock

@@ -34,7 +34,7 @@
 //! `ContinuationProof` bundle and `verify_continuation` checks it from the bundle
 //! and ELF alone (`prove_and_verify_continuation` is a thin wrapper over both).
 
-use std::collections::HashMap;
+use crate::det_hash::HashMap;
 
 use crypto::fiat_shamir::default_transcript::DefaultTranscript;
 use executor::elf::Elf;
@@ -533,7 +533,7 @@ fn prove_global(
     opts: &ProofOptions,
 ) -> Result<MultiProof<F, E, ()>, Error> {
     // Each cell's final state (boundaries are in epoch order, so the last fini wins).
-    let mut final_state: global_memory::FiniStateMap = HashMap::new();
+    let mut final_state: global_memory::FiniStateMap = HashMap::default();
     for epoch in boundaries {
         for b in epoch {
             final_state.insert(

prover/src/continuation.rs

@@ -17,7 +17,7 @@
 //! An occupancy bitmap is tracked so [`PagedMem::iter`] can yield exactly the
 //! cells that were explicitly `set`.
 
-use std::collections::HashMap;
+use crate::det_hash::HashMap;
 
 use crate::tables::page::DEFAULT_PAGE_SIZE;
 

prover/src/paged_mem.rs

@@ -34,7 +34,7 @@
 //! | GM-GENESIS | GlobalMemory | `[address, init, GENESIS]` | 1 (sender) |
 //! | GM-FINAL   | GlobalMemory | `[address, fini, fini_epoch]` | 1 (receiver) |
 
-use std::collections::HashMap;
+use crate::det_hash::HashMap;
 
 use stark::lookup::{BusInteraction, BusValue, LinearTerm, Multiplicity};
 use stark::trace::TraceTable;

prover/src/tables/global_memory.rs

@@ -54,7 +54,7 @@
 //! by every variable-length table). `MU` is self-enforced: dropping a real row
 //! (`MU = 0`) breaks its telescoping link → bus imbalance.
 
-use std::collections::HashMap;
+use crate::det_hash::HashMap;
 
 use stark::lookup::{BusInteraction, BusValue, LinearTerm, Multiplicity, Packing};
 use stark::trace::TraceTable;
@@ -501,7 +501,7 @@ mod tests {
 
     #[test]
     fn test_sparse_only_touched_cells() {
-        let initial_memory = HashMap::from([(10, 5)]);
+        let initial_memory = HashMap::from_iter([(10, 5)]);
         let epochs = vec![
             vec![(10, 7, 3), (20, 9, 4)], // epoch 0 touches 10 and 20
             vec![(10, 8, 10)],            // epoch 1 touches only 10
@@ -520,7 +520,7 @@ mod tests {
 
     #[test]
     fn test_genesis_init_for_first_touch() {
-        let initial_memory = HashMap::from([(10, 5)]);
+        let initial_memory = HashMap::from_iter([(10, 5)]);
         let epochs = vec![vec![(10, 7, 3), (20, 9, 4)]];
         let boundaries = epoch_boundaries(&initial_memory, &epochs);
 
@@ -548,7 +548,7 @@ mod tests {
 
     #[test]
     fn test_fini_records_current_epoch_label_and_timestamp() {
-        let initial_memory = HashMap::from([(10, 5)]);
+        let initial_memory = HashMap::from_iter([(10, 5)]);
         let epochs = vec![vec![(10, 7, 3)], vec![(10, 8, 10)]];
         let boundaries = epoch_boundaries(&initial_memory, &epochs);
 
@@ -573,7 +573,7 @@ mod tests {
 
     #[test]
     fn test_telescoping_consecutive_epochs() {
-        let initial_memory = HashMap::from([(10, 5)]);
+        let initial_memory = HashMap::from_iter([(10, 5)]);
         let epochs = vec![vec![(10, 7, 3)], vec![(10, 8, 10)]];
         let boundaries = epoch_boundaries(&initial_memory, &epochs);
 
@@ -599,7 +599,7 @@ mod tests {
     #[test]
     fn test_telescoping_skips_untouched_epochs() {
         // Cell 20 is touched in epoch 0, skipped in epoch 1, touched again in 2.
-        let initial_memory = HashMap::new();
+        let initial_memory = HashMap::default();
         let epochs = vec![
             vec![(20, 9, 4)],  // epoch 0 writes 20
             vec![(10, 1, 5)],  // epoch 1 does not touch 20

prover/src/tables/local_to_global.rs

@@ -1933,7 +1933,7 @@ fn touched_cells_from_memory_state(memory_state: &MemoryState) -> local_to_globa
 /// Bucket an initial-memory image into per-page byte arrays for PAGE init columns.
 pub(crate) fn build_init_page_data<I: ImageSource>(image: &I) -> HashMap<u64, Vec<u8>> {
     let page_size = page::DEFAULT_PAGE_SIZE;
-    let mut init_page_data: HashMap<u64, Vec<u8>> = HashMap::new();
+    let mut init_page_data: HashMap<u64, Vec<u8>> = HashMap::default();
     for (addr, value) in image.image_iter() {
         let page_base = page::page_base_for_address(addr);
         let offset = page::offset_in_page(addr);

prover/src/tables/trace_builder.rs

@@ -5,7 +5,7 @@
 //! program-end receiver (final value of each cell). The bus balances iff every
 //! epoch's `fini` matches the next epoch's `init` (the cross-epoch telescoping).
 
-use std::collections::HashMap;
+use crate::det_hash::HashMap;
 
 use crypto::fiat_shamir::default_transcript::DefaultTranscript;
 use math::field::element::FieldElement;
@@ -432,7 +432,7 @@ pub(crate) fn prove_global(boundaries: &[Vec<CellBoundary>]) -> MultiProof<F, E,
 
     // Program-end anchor: a RECEIVE token for each cell's final fini (epochs are
     // in order, so the last write wins).
-    let mut final_fini: HashMap<u64, Token> = HashMap::new();
+    let mut final_fini: HashMap<u64, Token> = HashMap::default();
     for epoch in boundaries {
         for b in epoch {
             final_fini.insert(b.address, (b.address, b.fini.value, b.fini.epoch));
@@ -507,7 +507,7 @@ pub(crate) fn prove_and_verify(boundaries: &[Vec<CellBoundary>]) -> bool {
 fn test_global_memory_bus_balances() {
     // Cell 10 touched in epochs 0,1,2; cell 20 in epoch 0 then again epoch 2
     // (skipping 1); cell 30 once.
-    let initial_memory = HashMap::from([(10u64, 5u64)]);
+    let initial_memory = HashMap::from_iter([(10u64, 5u64)]);
     let epochs = vec![
         vec![(10, 7, 3), (20, 9, 4)],
         vec![(10, 8, 10)],
@@ -519,7 +519,7 @@ fn test_global_memory_bus_balances() {
 
 #[test]
 fn test_global_memory_bus_rejects_tampered_boundary() {
-    let initial_memory = HashMap::from([(10u64, 5u64)]);
+    let initial_memory = HashMap::from_iter([(10u64, 5u64)]);
     let epochs = vec![vec![(10, 7, 3)], vec![(10, 8, 10)]];
     let mut boundaries = epoch_boundaries(&initial_memory, &epochs);
     assert!(prove_and_verify(&boundaries));
@@ -533,7 +533,7 @@ fn test_global_memory_bus_rejects_tampered_boundary() {
 fn test_l2g_binding_holds() {
     // Per-epoch L2G roots committed by the epoch proofs match the per-epoch L2G
     // sub-table roots in the final cross-epoch proof.
-    let initial_memory = HashMap::from([(10u64, 5u64)]);
+    let initial_memory = HashMap::from_iter([(10u64, 5u64)]);
     let epochs = vec![
         vec![(10, 7, 3), (20, 9, 4)],
         vec![(10, 8, 10)],
@@ -551,7 +551,7 @@ fn test_l2g_binding_holds() {
 fn test_l2g_binding_rejects_mismatch() {
     // The final proof uses a DIFFERENT epoch-0 L2G table than the epoch proofs
     // committed, so the binding must reject it.
-    let initial_memory = HashMap::from([(10u64, 5u64)]);
+    let initial_memory = HashMap::from_iter([(10u64, 5u64)]);
     let epochs = vec![
         vec![(10, 7, 3), (20, 9, 4)],
         vec![(10, 8, 10)],
@@ -620,7 +620,7 @@ fn prove_and_verify_global_with_traces(
         .map(|b| (b.address, b.init.value, b.init.originating_epoch))
         .collect();
 
-    let mut final_fini: HashMap<u64, Token> = HashMap::new();
+    let mut final_fini: HashMap<u64, Token> = HashMap::default();
     for epoch in boundaries {
         for b in epoch {
             final_fini.insert(b.address, (b.address, b.fini.value, b.fini.epoch));
@@ -691,7 +691,7 @@ fn prove_and_verify_global_with_traces(
 #[test]
 fn test_l2g_mu_zero_on_real_row_rejects() {
     // Two touched cells; row 0 is real (MU=1). We forge row 0's MU to 0.
-    let initial_memory = HashMap::from([(10u64, 5u64)]);
+    let initial_memory = HashMap::from_iter([(10u64, 5u64)]);
     let epochs = vec![vec![(10, 7, 3), (20, 9, 4)]];
     let boundaries = epoch_boundaries(&initial_memory, &epochs);
 
@@ -738,7 +738,7 @@ fn test_l2g_mu_zero_on_real_row_rejects() {
 #[test]
 fn test_l2g_mu_one_on_padding_row_rejects_global_bus() {
     // 3 real rows → 4-row trace (padding row at index 3).
-    let initial_memory = HashMap::new();
+    let initial_memory = HashMap::default();
     let epochs = vec![vec![(10, 7, 3), (20, 9, 4), (30, 1, 5)]];
     let boundaries = epoch_boundaries(&initial_memory, &epochs);
     assert_eq!(boundaries[0].len(), 3, "expect 3 real rows");
@@ -781,7 +781,7 @@ fn test_l2g_mu_one_on_padding_row_rejects_global_bus() {
 /// for the "set MU to 2, assert reject" pattern.
 #[test]
 fn test_l2g_mu_nonboolean_rejects_global_bus() {
-    let initial_memory = HashMap::from([(10u64, 5u64)]);
+    let initial_memory = HashMap::from_iter([(10u64, 5u64)]);
     let epochs = vec![vec![(10, 7, 3)]];
     let boundaries = epoch_boundaries(&initial_memory, &epochs);
 
@@ -885,7 +885,7 @@ fn test_l2g_init_epoch_ordering_field_arithmetic() {
 fn test_l2g_init_epoch_ordering_live_is_b20_rejects() {
     // Epoch 1 consumes epoch 0's fini for cell 10. Honest ordering has
     // init_epoch=1, fini_epoch=2, so 2 - 1 - 1 = 0 is a valid IsB20 lookup.
-    let initial_memory = HashMap::new();
+    let initial_memory = HashMap::default();
     let epochs = vec![vec![(10, 7, 3)], vec![(10, 8, 10)]];
     let boundaries = epoch_boundaries(&initial_memory, &epochs);
     let boundary = &boundaries[1];
@@ -963,7 +963,7 @@ fn test_l2g_init_epoch_ordering_live_is_b20_rejects() {
 fn test_l2g_design_y_orphan_mu_zero_rejects() {
     // Cell 10 touched in epoch 0 (label 1, fini value=7, ts=3) and epoch 1
     // (label 2, fini value=8, ts=10). Cell 20 touched in epoch 0 only.
-    let initial_memory = HashMap::from([(10u64, 5u64)]);
+    let initial_memory = HashMap::from_iter([(10u64, 5u64)]);
     let epochs = vec![vec![(10, 7, 3), (20, 9, 4)], vec![(10, 8, 10)]];
     let boundaries = epoch_boundaries(&initial_memory, &epochs);
 
@@ -1061,7 +1061,7 @@ fn test_continuation_private_input_spans_epochs() {
 fn test_local_memory_bus_balances() {
     // For each touched byte, L2G's init-receive (ts=0) + fini-send cancel the
     // MEMW chain's init-send + fini-receive: the epoch-local Memory bus balances.
-    let initial_memory = HashMap::from([(10u64, 5u64)]);
+    let initial_memory = HashMap::from_iter([(10u64, 5u64)]);
     let epochs = vec![vec![(10, 7, 3), (20, 9, 4)]];
     let boundaries = epoch_boundaries(&initial_memory, &epochs);
     assert!(prove_verify_memory(&boundaries[0], &boundaries[0]));
@@ -1071,7 +1071,7 @@ fn test_local_memory_bus_balances() {
 fn test_local_memory_bus_rejects_tamper() {
     // L2G claims the real fini value but the access chain ends on a different
     // one — the Memory bus no longer balances.
-    let initial_memory = HashMap::from([(10u64, 5u64)]);
+    let initial_memory = HashMap::from_iter([(10u64, 5u64)]);
     let epochs = vec![vec![(10, 7, 3)]];
     let boundaries = epoch_boundaries(&initial_memory, &epochs);
     assert!(prove_verify_memory(&boundaries[0], &boundaries[0]));

prover/src/tests/local_to_global_bus_tests.rs

@@ -3012,7 +3012,7 @@ fn test_prove_second_epoch_from_snapshot() {
     assert!(epochs.len() >= 3, "need an intermediate epoch 1");
 
     // Epoch 1 starts from epoch 0's ending memory + register snapshot.
-    let image: std::collections::HashMap<u64, u8> = epochs[0].end_memory.iter_bytes().collect();
+    let image: crate::det_hash::HashMap<u64, u8> = epochs[0].end_memory.iter_bytes().collect();
     let register_init =
         register::register_init_from_snapshot(&epochs[0].end_registers, epochs[0].end_pc);
 
@@ -3084,7 +3084,7 @@ fn test_epoch_proof_commits_l2g() {
     use crate::tables::register;
     use crate::tables::trace_builder::{build_initial_image, epoch_touched_cells};
     use crate::test_utils::asm_elf_bytes;
-    use std::collections::HashMap;
+    use crate::det_hash::HashMap;
 
     let _ = env_logger::builder().is_test(true).try_init();
     let elf_bytes = asm_elf_bytes("all_loadstore_32");
@@ -3207,7 +3207,7 @@ fn test_continuation_pipeline_end_to_end() {
     use crate::tables::register;
     use crate::tables::trace_builder::{build_initial_image, epoch_touched_cells};
     use crate::test_utils::asm_elf_bytes;
-    use std::collections::HashMap;
+    use crate::det_hash::HashMap;
 
     let _ = env_logger::builder().is_test(true).try_init();
     let elf_bytes = asm_elf_bytes("all_loadstore_32");
@@ -3365,7 +3365,7 @@ fn test_epoch_memory_bus_with_l2g_bookend() {
     use crate::tables::register;
     use crate::tables::trace_builder::build_initial_image;
     use crate::test_utils::asm_elf_bytes;
-    use std::collections::HashMap;
+    use crate::det_hash::HashMap;
 
     let _ = env_logger::builder().is_test(true).try_init();
     let elf_bytes = asm_elf_bytes("all_loadstore_32");

prover/src/tests/prove_elfs_tests.rs

@@ -88,7 +88,7 @@ fn test_bus_interactions() {
 
 #[test]
 fn test_fini_from_trace_reads_every_register() {
-    let mut final_state = FinalRegisterStateMap::new();
+    let mut final_state = FinalRegisterStateMap::default();
     final_state.insert(
         register_base_address(5), // addr 10
         FinalRegisterWordState {

prover/src/tests/register_tests.rs

@@ -883,7 +883,7 @@ fn test_epoch_end_memory_converts_to_image() {
     use crate::test_utils::asm_elf_bytes;
     use executor::elf::Elf;
     use executor::vm::execution::Executor;
-    use std::collections::HashMap;
+    use crate::det_hash::HashMap;
 
     let elf_bytes = asm_elf_bytes("basic_program");
     let program = Elf::load(&elf_bytes).unwrap();
@@ -914,7 +914,7 @@ fn test_build_traces_for_all_epochs() {
     use crate::test_utils::asm_elf_bytes;
     use executor::elf::Elf;
     use executor::vm::execution::Executor;
-    use std::collections::HashMap;
+    use crate::det_hash::HashMap;
 
     let elf_bytes = asm_elf_bytes("basic_program");
     let program = Elf::load(&elf_bytes).unwrap();
@@ -983,7 +983,7 @@ fn test_terminating_epoch_rejected_when_not_final() {
     use crate::test_utils::asm_elf_bytes;
     use executor::elf::Elf;
     use executor::vm::execution::Executor;
-    use std::collections::HashMap;
+    use crate::det_hash::HashMap;
 
     let elf_bytes = asm_elf_bytes("basic_program");
     let program = Elf::load(&elf_bytes).unwrap();
@@ -1036,7 +1036,7 @@ fn test_local_to_global_traces_from_real_execution() {
     use crate::test_utils::asm_elf_bytes;
     use executor::elf::Elf;
     use executor::vm::execution::Executor;
-    use std::collections::HashMap;
+    use crate::det_hash::HashMap;
 
     // A program that exercises memory (loads/stores), so some cells are touched.
     let elf_bytes = asm_elf_bytes("all_loadstore_32");