Use AccountTree type wrapper
#783
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,11 +5,11 @@ use std::{ | |
| }; | ||
|
|
||
| use miden_objects::{ | ||
| Digest, EMPTY_WORD, Word, ZERO, | ||
| account::AccountId, | ||
| batch::ProvenBatch, | ||
| block::{AccountTree, BlockHeader, BlockNumber, OutputNoteBatch, ProvenBlock}, | ||
| crypto::merkle::{Mmr, Smt}, | ||
| note::{NoteId, NoteInclusionProof}, | ||
| transaction::ProvenTransaction, | ||
| }; | ||
|
|
@@ -26,7 +26,7 @@ use crate::{ | |
| /// Builds a [`MockStoreSuccess`] | ||
| #[derive(Debug)] | ||
| pub struct MockStoreSuccessBuilder { | ||
| accounts: Option<AccountTree>, | ||
| notes: Option<Vec<OutputNoteBatch>>, | ||
| produced_nullifiers: Option<BTreeSet<Digest>>, | ||
| chain_mmr: Option<Mmr>, | ||
|
|
@@ -36,16 +36,13 @@ pub struct MockStoreSuccessBuilder { | |
| impl MockStoreSuccessBuilder { | ||
| pub fn from_batches<'a>(batches_iter: impl Iterator<Item = &'a ProvenBatch> + Clone) -> Self { | ||
| let accounts_smt = { | ||
| let accounts = batches_iter.clone().flat_map(|batch| { | ||
| batch | ||
| .account_updates() | ||
| .iter() | ||
| .map(|(account_id, update)| (*account_id, update.initial_state_commitment())) | ||
| }); | ||
| AccountTree::with_entries(accounts).unwrap() | ||
| }; | ||
|
|
||
| Self { | ||
|
|
@@ -58,12 +55,7 @@ impl MockStoreSuccessBuilder { | |
| } | ||
|
|
||
| pub fn from_accounts(accounts: impl Iterator<Item = (AccountId, Digest)>) -> Self { | ||
| let accounts_smt = AccountTree::with_entries(accounts).unwrap(); | ||
|
|
||
| Self { | ||
| accounts: Some(accounts_smt), | ||
|
|
@@ -107,7 +99,7 @@ impl MockStoreSuccessBuilder { | |
|
|
||
| pub fn build(self) -> MockStoreSuccess { | ||
| let block_num = self.block_num.unwrap_or(1.into()); | ||
| let accounts_smt = self.accounts.unwrap_or_default(); | ||
| let notes = self.notes.unwrap_or_default(); | ||
| let block_note_tree = note_created_smt_from_note_batches(notes.iter()); | ||
| let note_root = block_note_tree.root(); | ||
|
|
@@ -168,7 +160,7 @@ impl MockStoreSuccessBuilder { | |
|
|
||
| pub struct MockStoreSuccess { | ||
| /// Map account id -> account commitment | ||
| pub accounts: Arc<RwLock<AccountTree>>, | ||
|
|
||
| /// Stores the nullifiers of the notes that were consumed | ||
| pub produced_nullifiers: Arc<RwLock<Smt>>, | ||
|
|
@@ -202,7 +194,8 @@ impl MockStoreSuccess { | |
| // update accounts | ||
| for update in block.updated_accounts() { | ||
| locked_accounts | ||
| .insert(update.account_id(), update.final_state_commitment()) | ||
| .expect("TODO: what should we do with this error?"); | ||
|
Comment on lines
-205
to
+198
Contributor
Author
There was a problem hiding this comment. @Mirko-von-Leipzig What should we do with this one? This is test code, so panicking might be fine? Otherwise I'll have to add a new variant to |
||
| } | ||
| let header = block.header(); | ||
| debug_assert_eq!(locked_accounts.root(), header.account_root()); | ||
|
|
@@ -254,12 +247,12 @@ impl MockStoreSuccess { | |
| let locked_produced_nullifiers = self.produced_nullifiers.read().await; | ||
|
|
||
| let account_commitment = { | ||
| let account_commitment = locked_accounts.get(proven_tx.account_id()); | ||
|
|
||
| if Word::from(account_commitment) == EMPTY_WORD { | ||
| None | ||
| } else { | ||
| Some(account_commitment) | ||
| } | ||
| }; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this right? Seems like there is no difference between
num_block_created_notesandnum_batch_created_notesand sonum_erased_noteswill always be 0There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yeah nice catch. It looks like the
blockvariant is incorrect now.ProposedBlock::output_note_batchesshould be used there it seems, though the naming is a bit confusing :)I'll create an issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice catch!