Merge branch 'next' into polydez-onchain-accounts-store

# Conflicts: # block-producer/src/block_builder/prover/block_witness.rs # block-producer/src/test_utils/block.rs
0xPolygonMiden · Apr 5, 2024 · 09987a8 · 09987a8
2 parents 12a8bb9 + bb79cb2
commit 09987a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/block-producer/src/block_builder/mod.rs b/block-producer/src/block_builder/mod.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use miden_node_utils::formatting::{format_array, format_blake3_digest};
-use miden_objects::{accounts::AccountId, notes::Nullifier, Digest};
+use miden_objects::notes::Nullifier;
 use tracing::{debug, info, instrument};
 
 use crate::{

diff --git a/block-producer/src/block_builder/prover/block_witness.rs b/block-producer/src/block_builder/prover/block_witness.rs
@@ -50,7 +50,9 @@ impl BlockWitness {
                 .iter()
                 .flat_map(|batch| batch.updated_accounts())
                 .map(
-                    |UpdatedAccount {account_id, final_state_hash,
+                    |UpdatedAccount {
+                         account_id,
+                         final_state_hash,
                          ..
                      }| {
                         let initial_state_hash = account_initial_states

diff --git a/block-producer/src/test_utils/block.rs b/block-producer/src/test_utils/block.rs
@@ -1,8 +1,5 @@
-use std::collections::BTreeMap;
-
 use miden_node_proto::domain::accounts::UpdatedAccount;
 use miden_objects::{
-    accounts::AccountId,
     block::BlockNoteTree,
     crypto::merkle::{Mmr, SimpleSmt},
     notes::{NoteEnvelope, Nullifier},