adapter - enable test-util for primitives

Author: elpiel

adapter/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 
 [features]
 
-test-util = []
+test-util = ["primitives/test-util"]
 
 [dependencies]
 primitives = { path = "../primitives" }

adapter/src/ethereum.rs

@@ -501,7 +501,10 @@ mod test {
     use super::test_util::*;
     use super::*;
     use chrono::Utc;
-    use primitives::{config::DEVELOPMENT_CONFIG, test_util::{LEADER, CREATOR, IDS}};
+    use primitives::{
+        config::DEVELOPMENT_CONFIG,
+        test_util::{CREATOR, IDS, LEADER},
+    };
     use web3::{transports::Http, Web3};
     use wiremock::{
         matchers::{method, path},

adapter/src/ethereum/test_util.rs

@@ -194,11 +194,7 @@ pub async fn deploy_sweeper_contract(
             opt.gas_price = Some(1.into());
             opt.gas = Some(6_721_975.into());
         }))
-        .execute(
-            *SWEEPER_BYTECODE,
-            (),
-            H160(LEADER.to_bytes()),
-        )
+        .execute(*SWEEPER_BYTECODE, (), H160(LEADER.to_bytes()))
         .await?;
 
     let sweeper_address = Address::from(sweeper_contract.address().to_fixed_bytes());
@@ -217,18 +213,14 @@ pub async fn deploy_outpace_contract(
             opt.gas_price = Some(1.into());
             opt.gas = Some(6_721_975.into());
         }))
-        .execute(
-            *OUTPACE_BYTECODE,
-            (),
-            H160(LEADER.to_bytes()),
-        )
+        .execute(*OUTPACE_BYTECODE, (), H160(LEADER.to_bytes()))
         .await?;
     let outpace_address = Address::from(outpace_contract.address().to_fixed_bytes());
 
     Ok((outpace_address, outpace_contract))
 }
 
-/// Deploys the Mock Token contract from `GANACHE_ADDRESS['leader']`
+/// Deploys the Mock Token contract from [`LEADER`]
 pub async fn deploy_token_contract(
     web3: &Web3<Http>,
     min_token_units: u64,
@@ -240,11 +232,7 @@ pub async fn deploy_token_contract(
             opt.gas_price = Some(1.into());
             opt.gas = Some(6_721_975.into());
         }))
-        .execute(
-            *MOCK_TOKEN_BYTECODE,
-            (),
-            H160(LEADER.to_bytes()),
-        )
+        .execute(*MOCK_TOKEN_BYTECODE, (), H160(LEADER.to_bytes()))
         .await?;
 
     let token_info = TokenInfo {

primitives/src/test_util.rs

@@ -5,13 +5,13 @@ use crate::Address;
 /// re-export all other statics before moving all of them to this module
 pub use crate::util::tests::prep_db::*;
 
-pub static LEADER: Lazy<Address> = Lazy::new(|| ADDRESS_0.clone());
-pub static FOLLOWER: Lazy<Address> = Lazy::new(|| ADDRESS_1.clone());
-pub static GUARDIAN: Lazy<Address> = Lazy::new(|| ADDRESS_2.clone());
-pub static CREATOR: Lazy<Address> = Lazy::new(|| ADDRESS_3.clone());
-pub static ADVERTISER: Lazy<Address> = Lazy::new(|| ADDRESS_4.clone());
-pub static PUBLISHER: Lazy<Address> = Lazy::new(|| ADDRESS_5.clone());
-pub static GUARDIAN_2: Lazy<Address> = Lazy::new(|| ADDRESS_6.clone());
+pub static LEADER: Lazy<Address> = Lazy::new(|| *ADDRESS_0);
+pub static FOLLOWER: Lazy<Address> = Lazy::new(|| *ADDRESS_1);
+pub static GUARDIAN: Lazy<Address> = Lazy::new(|| *ADDRESS_2);
+pub static CREATOR: Lazy<Address> = Lazy::new(|| *ADDRESS_3);
+pub static ADVERTISER: Lazy<Address> = Lazy::new(|| *ADDRESS_4);
+pub static PUBLISHER: Lazy<Address> = Lazy::new(|| *ADDRESS_5);
+pub static GUARDIAN_2: Lazy<Address> = Lazy::new(|| *ADDRESS_6);
 
 /// passhprase: ganache0
 pub static ADDRESS_0: Lazy<Address> = Lazy::new(|| {

sentry/src/spender.rs

@@ -20,7 +20,8 @@ pub mod fee {
     #[cfg(test)]
     mod test {
         use primitives::{
-            test_util::{PUBLISHER, DUMMY_VALIDATOR_LEADER}, UnifiedNum,
+            test_util::{DUMMY_VALIDATOR_LEADER, PUBLISHER},
+            UnifiedNum,
         };
 
         use crate::spender::fee::calculate_fee;