Utxo crate cleanup

chainstate-storage/src/internal/mod.rs

@@ -21,8 +21,7 @@ use common::chain::{Block, GenBlock, OutPoint, OutPointSourceId};
 use common::primitives::{BlockHeight, Id, Idable};
 use serialization::{Codec, Decode, DecodeAll, Encode};
 use storage::traits::{self, MapMut, MapRef, TransactionRo, TransactionRw};
-use utxo::utxo_storage::{UtxosStorageRead, UtxosStorageWrite};
-use utxo::{BlockUndo, Utxo};
+use utxo::{BlockUndo, Utxo, UtxosStorageRead, UtxosStorageWrite};
 
 use crate::{BlockchainStorage, BlockchainStorageRead, BlockchainStorageWrite, Transactional};
 

chainstate-storage/src/lib.rs

@@ -21,7 +21,7 @@ use common::chain::OutPointSourceId;
 use common::chain::{Block, GenBlock};
 use common::primitives::{BlockHeight, Id};
 use storage::traits;
-use utxo::utxo_storage::{UtxosStorageRead, UtxosStorageWrite};
+use utxo::{UtxosStorageRead, UtxosStorageWrite};
 
 mod internal;
 #[cfg(any(test, feature = "mock"))]

chainstate/src/detail/mod.rs

@@ -23,7 +23,7 @@ use itertools::Itertools;
 use logging::log;
 use std::sync::Arc;
 use utils::eventhandler::{EventHandler, EventsController};
-use utxo::utxo_storage::UtxosDBMut;
+use utxo::UtxosDBMut;
 mod consensus_validator;
 mod orphan_blocks;
 

utxo/Cargo.toml

@@ -17,5 +17,6 @@ thiserror = "1.0"
 
 [dev-dependencies]
 crypto = { path = '../crypto' }
-
 itertools = "0.10"
+rstest = "0.15"
+test-utils = {path = '../test-utils'}