Skip to content

Commit

Permalink
Fix Clippy and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
LindaGuiga committed Jul 23, 2024
1 parent 7ebae47 commit e1e1fca
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
20 changes: 2 additions & 18 deletions evm_arithmetization/src/generation/mpt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,6 @@ associated storage trie hash"
empty_nibbles(),
storage_trie,
storage_leaves,
trie_data,
&parse_storage_value,
)?;

Expand All @@ -426,7 +425,6 @@ pub(crate) fn get_storage_leaves<F>(
key: Nibbles,
trie: &HashedPartialTrie,
storage_leaves: &mut Vec<Option<U256>>,
trie_data: &mut Vec<Option<U256>>,
parse_value: &F,
) -> Result<(), ProgramError>
where
Expand All @@ -440,29 +438,15 @@ where
count: 1,
packed: i.into(),
});
get_storage_leaves(
address,
extended_key,
child,
storage_leaves,
trie_data,
parse_value,
)?;
get_storage_leaves(address, extended_key, child, storage_leaves, parse_value)?;
}

Ok(())
}

Node::Extension { nibbles, child } => {
let extended_key = key.merge_nibbles(nibbles);
get_storage_leaves(
address,
extended_key,
child,
storage_leaves,
trie_data,
parse_value,
)?;
get_storage_leaves(address, extended_key, child, storage_leaves, parse_value)?;

Ok(())
}
Expand Down
5 changes: 0 additions & 5 deletions evm_arithmetization/src/generation/prover_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ impl<F: Field> GenerationState<F> {
Some(state_root_ptr) => Ok(state_root_ptr),
None => {
self.set_preinit = true;
let l = self.memory.contexts[0].segments[Segment::TrieData.unscale()]
.content
.len();

let mut new_content = self.memory.get_preinit_memory(Segment::TrieData);

let n = load_state_mpt(&self.inputs.trimmed_tries, &mut new_content)?;
Expand All @@ -104,7 +100,6 @@ impl<F: Field> GenerationState<F> {
content: new_content,
},
);

Ok(n)
}
}
Expand Down

0 comments on commit e1e1fca

Please sign in to comment.