refactor(archival_mmr): Move module out of mutator-set directory

With the `archival_block_mmr` field in `ArchivalState`, we are using
archival-MMRs in other contexts than mutator sets. So it makes sense to
remove that context from the `archival_mmr` module.

benches/archival_mmr.rs

@@ -8,7 +8,7 @@ use neptune_cash::database::storage::storage_schema::DbtVec;
 use neptune_cash::database::storage::storage_schema::SimpleRustyStorage;
 use neptune_cash::database::storage::storage_vec::traits::StorageVecBase;
 use neptune_cash::database::NeptuneLevelDb;
-use neptune_cash::util_types::mutator_set::archival_mmr::ArchivalMmr;
+use neptune_cash::util_types::archival_mmr::ArchivalMmr;
 use rand::random;
 use tasm_lib::prelude::Digest;
 use tasm_lib::twenty_first::util_types::mmr::shared_advanced::num_leafs_to_num_nodes;

src/models/blockchain/block/mod.rs

@@ -1070,7 +1070,7 @@ mod block_tests {
     use crate::tests::shared::make_mock_block;
     use crate::tests::shared::make_mock_transaction;
     use crate::tests::shared::mock_genesis_global_state;
-    use crate::util_types::mutator_set::archival_mmr::ArchivalMmr;
+    use crate::util_types::archival_mmr::ArchivalMmr;
 
     #[test]
     fn all_genesis_blocks_have_unique_mutator_set_hashes() {
@@ -1193,7 +1193,7 @@ mod block_tests {
             .unwrap();
         let mut storage = SimpleRustyStorage::new(db);
         let ammr_storage = storage.schema.new_vec::<Digest>("ammr-blocks-0").await;
-        let mut ammr: ArchivalMmr<_> = ArchivalMmr::new(ammr_storage).await;
+        let mut ammr = ArchivalMmr::new(ammr_storage).await;
         ammr.append(genesis_block.hash()).await;
         let mut mmra = MmrAccumulator::new_from_leafs(vec![genesis_block.hash()]);
 

src/models/state/archival_state.rs

@@ -35,8 +35,8 @@ use crate::models::database::BlockRecord;
 use crate::models::database::FileRecord;
 use crate::models::database::LastFileRecord;
 use crate::prelude::twenty_first;
+use crate::util_types::archival_mmr::ArchivalMmr;
 use crate::util_types::mutator_set::addition_record::AdditionRecord;
-use crate::util_types::mutator_set::archival_mmr::ArchivalMmr;
 use crate::util_types::mutator_set::mutator_set_accumulator::MutatorSetAccumulator;
 use crate::util_types::mutator_set::removal_record::AbsoluteIndexSet;
 use crate::util_types::mutator_set::removal_record::RemovalRecord;

src/util_types/mod.rs

@@ -1,3 +1,4 @@
+pub mod archival_mmr;
 pub mod mutator_set;
 
 #[cfg(test)]

src/util_types/mutator_set.rs

@@ -15,7 +15,6 @@ use crate::models::blockchain::shared::Hash;
 
 pub mod active_window;
 pub mod addition_record;
-pub mod archival_mmr;
 pub mod archival_mutator_set;
 pub mod chunk;
 pub mod chunk_dictionary;

src/util_types/mutator_set/archival_mutator_set.rs

@@ -8,7 +8,6 @@ use twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
 
 use super::active_window::ActiveWindow;
 use super::addition_record::AdditionRecord;
-use super::archival_mmr::ArchivalMmr;
 use super::chunk::Chunk;
 use super::chunk_dictionary::ChunkDictionary;
 use super::ms_membership_proof::MsMembershipProof;
@@ -19,6 +18,7 @@ use super::shared::CHUNK_SIZE;
 use crate::database::storage::storage_vec::traits::*;
 use crate::models::blockchain::shared::Hash;
 use crate::prelude::twenty_first;
+use crate::util_types::archival_mmr::ArchivalMmr;
 use crate::util_types::mutator_set::get_swbf_indices;
 use crate::util_types::mutator_set::MutatorSetError;
 

src/util_types/mutator_set/chunk_dictionary.rs

@@ -209,8 +209,8 @@ mod chunk_dict_tests {
     use twenty_first::math::tip5::Digest;
     use twenty_first::util_types::mmr::mmr_membership_proof::MmrMembershipProof;
 
-    use super::super::archival_mmr::mmr_test::mock;
     use super::*;
+    use crate::util_types::archival_mmr::mmr_test::mock;
     use crate::util_types::mutator_set::shared::CHUNK_SIZE;
     use crate::util_types::test_shared::mutator_set::random_chunk_dictionary;
 

src/util_types/mutator_set/rusty_archival_mutator_set.rs

@@ -1,7 +1,6 @@
 use twenty_first::math::tip5::Digest;
 
 use super::active_window::ActiveWindow;
-use super::archival_mmr::ArchivalMmr;
 use super::archival_mutator_set::ArchivalMutatorSet;
 use super::chunk::Chunk;
 use crate::database::storage::storage_schema::traits::*;
@@ -12,6 +11,7 @@ use crate::database::storage::storage_schema::RustyValue;
 use crate::database::storage::storage_schema::SimpleRustyStorage;
 use crate::database::NeptuneLevelDb;
 use crate::prelude::twenty_first;
+use crate::util_types::archival_mmr::ArchivalMmr;
 
 type AmsMmrStorage = DbtVec<Digest>;
 type AmsChunkStorage = DbtVec<Chunk>;