trace_decoder::typed_mpt -> trace_decoder::tries

0xPolygonZero · Oct 7, 2024 · 13f03ad · 13f03ad
1 parent 96d2748
commit 13f03ad
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/trace_decoder/src/core.rs b/trace_decoder/src/core.rs
@@ -21,10 +21,10 @@ use zk_evm_common::gwei_to_wei;
 
 use crate::{
     observer::{DummyObserver, Observer},
-    typed_mpt::StateSmt,
+    tries::StateSmt,
 };
 use crate::{
-    typed_mpt::{MptKey, ReceiptTrie, StateMpt, StateTrie, StorageTrie, TransactionTrie},
+    tries::{MptKey, ReceiptTrie, StateMpt, StateTrie, StorageTrie, TransactionTrie},
     BlockLevelData, BlockTrace, BlockTraceTriePreImages, CombinedPreImages, ContractCodeUsage,
     OtherBlockData, SeparateStorageTriesPreImage, SeparateTriePreImage, SeparateTriePreImages,
     TxnInfo, TxnMeta, TxnTrace,

diff --git a/trace_decoder/src/lib.rs b/trace_decoder/src/lib.rs
@@ -56,9 +56,9 @@ mod interface;
 
 pub use interface::*;
 
+mod tries;
 mod type1;
 mod type2;
-mod typed_mpt;
 mod wire;
 
 pub use core::{entrypoint, WireDisposition};

diff --git a/trace_decoder/src/observer.rs b/trace_decoder/src/observer.rs
@@ -4,7 +4,7 @@ use std::marker::PhantomData;
 use ethereum_types::{H256, U256};
 
 use crate::core::IntraBlockTries;
-use crate::typed_mpt::{ReceiptTrie, StorageTrie, TransactionTrie};
+use crate::tries::{ReceiptTrie, StorageTrie, TransactionTrie};
 
 /// Observer API for the trace decoder.
 /// Observer is used to collect various debugging and metadata info

diff --git a/trace_decoder/src/typed_mpt.rs → trace_decoder/src/tries.rs b/trace_decoder/src/typed_mpt.rs → trace_decoder/src/tries.rs
@@ -1,4 +1,4 @@
-//! Principled MPT types used in this library.
+//! Principled trie types and abstractions used in this library.
 
 use core::fmt;
 use std::{cmp, collections::BTreeMap, marker::PhantomData};

diff --git a/trace_decoder/src/type1.rs b/trace_decoder/src/type1.rs
@@ -12,7 +12,7 @@ use mpt_trie::partial_trie::OnOrphanedHashNode;
 use nunny::NonEmpty;
 use u4::U4;
 
-use crate::typed_mpt::{MptKey, StateMpt, StorageTrie};
+use crate::tries::{MptKey, StateMpt, StorageTrie};
 use crate::wire::{Instruction, SmtLeaf};
 
 #[derive(Debug, Clone)]
@@ -379,7 +379,7 @@ fn finish_stack(v: &mut Vec<Node>) -> anyhow::Result<Execution> {
 
 #[test]
 fn test_tries() {
-    use crate::typed_mpt::StateTrie as _;
+    use crate::tries::StateTrie as _;
 
     for (ix, case) in
         serde_json::from_str::<Vec<super::Case>>(include_str!("cases/zero_jerigon.json"))

diff --git a/trace_decoder/src/type2.rs b/trace_decoder/src/type2.rs
@@ -12,7 +12,7 @@ use nunny::NonEmpty;
 use stackstack::Stack;
 
 use crate::{
-    typed_mpt::{SmtKey, StateSmt},
+    tries::{SmtKey, StateSmt},
     wire::{Instruction, SmtLeaf, SmtLeafType},
 };