From a31d6febca2319d2d8245fa92032522d44c43ab1 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Fri, 16 Apr 2021 11:14:29 +1000 Subject: [PATCH] We don't need to import ourselves --- swap/tests/harness/mod.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/swap/tests/harness/mod.rs b/swap/tests/harness/mod.rs index baf969c1..8264b527 100644 --- a/swap/tests/harness/mod.rs +++ b/swap/tests/harness/mod.rs @@ -1,7 +1,6 @@ mod bitcoind; mod electrs; -use crate::harness; use anyhow::{bail, Context, Result}; use async_trait::async_trait; use bitcoin_harness::{BitcoindRpcApi, Client}; @@ -51,7 +50,7 @@ where let env_config = C::get_config(); - let (monero, containers) = harness::init_containers(&cli).await; + let (monero, containers) = init_containers(&cli).await; monero.init_miner().await.unwrap(); let btc_amount = bitcoin::Amount::from_sat(1_000_000); @@ -62,7 +61,7 @@ where let electrs_rpc_port = containers .electrs - .get_host_port(harness::electrs::RPC_PORT) + .get_host_port(electrs::RPC_PORT) .expect("Could not map electrs rpc port"); let alice_seed = Seed::random().unwrap(); @@ -172,7 +171,7 @@ async fn init_bitcoind_container( let docker = cli.run_with_args(image, run_args); let a = docker - .get_host_port(harness::bitcoind::RPC_PORT) + .get_host_port(bitcoind::RPC_PORT) .context("Could not map bitcoind rpc port")?; let bitcoind_url = { @@ -212,11 +211,7 @@ pub async fn init_electrs_container( bitcoind_container_name: String, network: String, ) -> Result> { - let bitcoind_rpc_addr = format!( - "{}:{}", - bitcoind_container_name, - harness::bitcoind::RPC_PORT - ); + let bitcoind_rpc_addr = format!("{}:{}", bitcoind_container_name, bitcoind::RPC_PORT); let image = electrs::Electrs::default() .with_volume(volume) .with_daemon_rpc_addr(bitcoind_rpc_addr)