Fix test units.

.gitignore

@@ -1,6 +1,5 @@
 *.pyc
 *.sage.py
-/Cargo.lock
 target/*
 /zkas/target
 /zkas/zkas
@@ -9,4 +8,4 @@ target/*
 /darkfid
 /cashierd
 /gatewayd
-/tx
+/ircd

bin/cashierd/src/service/btc.rs

@@ -914,14 +914,10 @@ pub type BtcResult<T> = std::result::Result<T, BtcFailed>;
 
 #[cfg(test)]
 mod tests {
-
-    use std::str::FromStr;
-
-    use secp256k1::constants::{PUBLIC_KEY_SIZE, SECRET_KEY_SIZE};
-
-    use darkfi::serial::{deserialize, serialize};
-
     use super::*;
+    use darkfi::util::serial::{deserialize, serialize};
+    use secp256k1::constants::{PUBLIC_KEY_SIZE, SECRET_KEY_SIZE};
+    use std::str::FromStr;
 
     const KEYPAIR_LENGTH: usize = SECRET_KEY_SIZE + PUBLIC_KEY_SIZE;
 

src/crypto/keypair.rs

@@ -192,9 +192,9 @@ impl Decodable for PublicKey {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::crypto::{
-        serial::{deserialize, serialize},
-        util::pedersen_commitment_scalar,
+    use crate::{
+        crypto::util::pedersen_commitment_scalar,
+        util::serial::{deserialize, serialize},
     };
 
     #[test]

src/crypto/token_list.rs

@@ -183,10 +183,6 @@ pub fn symbol_to_id(token: &str, tokenlist: &TokenList) -> Result<String> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        util::{DrkTokenList, TokenList},
-        Result,
-    };
 
     fn _get_sol_tokens() -> Result<TokenList> {
         let file_contents = include_bytes!("../../testdata/solanatokenlisttest.json");

src/node/service/reqrep.rs

@@ -371,7 +371,7 @@ impl Decodable for Reply {
 #[cfg(test)]
 mod tests {
     use super::{Reply, Request, Result};
-    use crate::serial::{deserialize, serialize};
+    use crate::util::serial::{deserialize, serialize};
 
     #[test]
     fn serialize_and_deserialize_request_test() {

src/node/wallet/cashierdb.rs

@@ -479,7 +479,7 @@ impl CashierDb {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::serial::serialize;
+    use crate::util::serial::serialize;
     use pasta_curves::arithmetic::Field;
     use rand::rngs::OsRng;
 

src/node/wallet/walletdb.rs

@@ -377,8 +377,8 @@ impl WalletDb {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        crypto::merkle_node::MerkleNode,
+    use crate::crypto::{
+        merkle_node::MerkleNode,
         types::{DrkCoinBlind, DrkSerial, DrkValueBlind},
     };
     use incrementalmerkletree::{Frontier, Tree};