From 881913ad9cb3f68ae3a467b70563a38bc0526a67 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Fri, 16 Apr 2021 11:12:27 +1000 Subject: [PATCH] Re-order content of harness/mod.rs in a sane way Most important things come first, remaining items are defined roughly in the order they are used by the top level components. --- swap/tests/harness/mod.rs | 700 +++++++++++++++++++------------------- 1 file changed, 350 insertions(+), 350 deletions(-) diff --git a/swap/tests/harness/mod.rs b/swap/tests/harness/mod.rs index e23801b4..baf969c1 100644 --- a/swap/tests/harness/mod.rs +++ b/swap/tests/harness/mod.rs @@ -36,6 +36,308 @@ use tracing_subscriber::util::SubscriberInitExt; use url::Url; use uuid::Uuid; +pub async fn setup_test(_config: C, testfn: T) +where + T: Fn(TestContext) -> F, + F: Future>, + C: GetConfig, +{ + let cli = Cli::default(); + + let _guard = tracing_subscriber::fmt() + .with_env_filter("warn,swap=debug,monero_harness=debug,monero_rpc=debug,bitcoin_harness=info,testcontainers=info") + .with_test_writer() + .set_default(); + + let env_config = C::get_config(); + + let (monero, containers) = harness::init_containers(&cli).await; + monero.init_miner().await.unwrap(); + + let btc_amount = bitcoin::Amount::from_sat(1_000_000); + let xmr_amount = monero::Amount::from_monero(btc_amount.as_btc() / FixedRate::RATE).unwrap(); + + let alice_starting_balances = + StartingBalances::new(bitcoin::Amount::ZERO, xmr_amount, Some(10)); + + let electrs_rpc_port = containers + .electrs + .get_host_port(harness::electrs::RPC_PORT) + .expect("Could not map electrs rpc port"); + + let alice_seed = Seed::random().unwrap(); + let (alice_bitcoin_wallet, alice_monero_wallet) = init_test_wallets( + MONERO_WALLET_NAME_ALICE, + containers.bitcoind_url.clone(), + &monero, + alice_starting_balances.clone(), + tempdir().unwrap().path(), + electrs_rpc_port, + &alice_seed, + env_config, + ) + .await; + + let alice_listen_port = get_port().expect("Failed to find a free port"); + let alice_listen_address: Multiaddr = format!("/ip4/127.0.0.1/tcp/{}", alice_listen_port) + .parse() + .expect("failed to parse Alice's address"); + + let alice_db_path = tempdir().unwrap().into_path(); + let (alice_handle, alice_swap_handle) = start_alice( + &alice_seed, + alice_db_path.clone(), + alice_listen_address.clone(), + env_config, + alice_bitcoin_wallet.clone(), + alice_monero_wallet.clone(), + ); + + let bob_seed = Seed::random().unwrap(); + let bob_starting_balances = StartingBalances::new(btc_amount * 10, monero::Amount::ZERO, None); + + let (bob_bitcoin_wallet, bob_monero_wallet) = init_test_wallets( + MONERO_WALLET_NAME_BOB, + containers.bitcoind_url, + &monero, + bob_starting_balances.clone(), + tempdir().unwrap().path(), + electrs_rpc_port, + &bob_seed, + env_config, + ) + .await; + + let bob_params = BobParams { + seed: Seed::random().unwrap(), + db_path: tempdir().unwrap().path().to_path_buf(), + bitcoin_wallet: bob_bitcoin_wallet.clone(), + monero_wallet: bob_monero_wallet.clone(), + alice_address: alice_listen_address.clone(), + alice_peer_id: alice_handle.peer_id, + env_config, + }; + + monero.start_miner().await.unwrap(); + + let test = TestContext { + env_config, + btc_amount, + xmr_amount, + alice_seed, + alice_db_path, + alice_listen_address, + alice_starting_balances, + alice_bitcoin_wallet, + alice_monero_wallet, + alice_swap_handle, + alice_handle, + bob_params, + bob_starting_balances, + bob_bitcoin_wallet, + bob_monero_wallet, + }; + + testfn(test).await.unwrap() +} + +async fn init_containers(cli: &Cli) -> (Monero, Containers<'_>) { + let prefix = random_prefix(); + let bitcoind_name = format!("{}_{}", prefix, "bitcoind"); + let (bitcoind, bitcoind_url) = + init_bitcoind_container(&cli, prefix.clone(), bitcoind_name.clone(), prefix.clone()) + .await + .expect("could not init bitcoind"); + let electrs = init_electrs_container(&cli, prefix.clone(), bitcoind_name, prefix) + .await + .expect("could not init electrs"); + let (monero, monerods) = init_monero_container(&cli).await; + (monero, Containers { + bitcoind_url, + bitcoind, + monerods, + electrs, + }) +} + +async fn init_bitcoind_container( + cli: &Cli, + volume: String, + name: String, + network: String, +) -> Result<(Container<'_, Cli, bitcoind::Bitcoind>, Url)> { + let image = bitcoind::Bitcoind::default().with_volume(volume); + + let run_args = RunArgs::default().with_name(name).with_network(network); + + let docker = cli.run_with_args(image, run_args); + let a = docker + .get_host_port(harness::bitcoind::RPC_PORT) + .context("Could not map bitcoind rpc port")?; + + let bitcoind_url = { + let input = format!( + "http://{}:{}@localhost:{}", + bitcoind::RPC_USER, + bitcoind::RPC_PASSWORD, + a + ); + Url::parse(&input).unwrap() + }; + + init_bitcoind(bitcoind_url.clone(), 5).await?; + + Ok((docker, bitcoind_url.clone())) +} + +async fn init_monero_container( + cli: &Cli, +) -> ( + Monero, + Vec>, +) { + let (monero, monerods) = Monero::new(&cli, vec![ + MONERO_WALLET_NAME_ALICE.to_owned(), + MONERO_WALLET_NAME_BOB.to_owned(), + ]) + .await + .unwrap(); + + (monero, monerods) +} + +pub async fn init_electrs_container( + cli: &Cli, + volume: String, + bitcoind_container_name: String, + network: String, +) -> Result> { + let bitcoind_rpc_addr = format!( + "{}:{}", + bitcoind_container_name, + harness::bitcoind::RPC_PORT + ); + let image = electrs::Electrs::default() + .with_volume(volume) + .with_daemon_rpc_addr(bitcoind_rpc_addr) + .with_tag("latest"); + + let run_args = RunArgs::default().with_network(network); + + let docker = cli.run_with_args(image, run_args); + + Ok(docker) +} + +fn start_alice( + seed: &Seed, + db_path: PathBuf, + listen_address: Multiaddr, + env_config: Config, + bitcoin_wallet: Arc, + monero_wallet: Arc, +) -> (AliceApplicationHandle, Receiver) { + let db = Arc::new(Database::open(db_path.as_path()).unwrap()); + + let mut swarm = swarm::alice(&seed).unwrap(); + swarm.listen_on(listen_address).unwrap(); + + let (event_loop, swap_handle) = alice::EventLoop::new( + swarm, + env_config, + bitcoin_wallet, + monero_wallet, + db, + FixedRate::default(), + bitcoin::Amount::ONE_BTC, + ) + .unwrap(); + + let peer_id = event_loop.peer_id(); + let handle = tokio::spawn(event_loop.run()); + + (AliceApplicationHandle { handle, peer_id }, swap_handle) +} + +#[allow(clippy::too_many_arguments)] +async fn init_test_wallets( + name: &str, + bitcoind_url: Url, + monero: &Monero, + starting_balances: StartingBalances, + datadir: &Path, + electrum_rpc_port: u16, + seed: &Seed, + env_config: Config, +) -> (Arc, Arc) { + monero + .init_wallet( + name, + starting_balances + .xmr_outputs + .into_iter() + .map(|amount| amount.as_piconero()) + .collect(), + ) + .await + .unwrap(); + + let xmr_wallet = swap::monero::Wallet::connect( + monero.wallet(name).unwrap().client(), + name.to_string(), + env_config, + ) + .await + .unwrap(); + + let electrum_rpc_url = { + let input = format!("tcp://@localhost:{}", electrum_rpc_port); + Url::parse(&input).unwrap() + }; + + let btc_wallet = swap::bitcoin::Wallet::new( + electrum_rpc_url, + datadir, + seed.derive_extended_private_key(env_config.bitcoin_network) + .expect("Could not create extended private key from seed"), + env_config, + ) + .await + .expect("could not init btc wallet"); + + if starting_balances.btc != bitcoin::Amount::ZERO { + mint( + bitcoind_url, + btc_wallet.new_address().await.unwrap(), + starting_balances.btc, + ) + .await + .expect("could not mint btc starting balance"); + + let mut interval = interval(Duration::from_secs(1u64)); + let mut retries = 0u8; + let max_retries = 30u8; + loop { + retries += 1; + btc_wallet.sync().await.unwrap(); + + let btc_balance = btc_wallet.balance().await.unwrap(); + + if btc_balance == starting_balances.btc { + break; + } else if retries == max_retries { + panic!( + "Bitcoin wallet initialization failed, reached max retries upon balance sync" + ) + } + + interval.tick().await; + } + } + + (Arc::new(btc_wallet), Arc::new(xmr_wallet)) +} + const MONERO_WALLET_NAME_BOB: &str = "bob"; const MONERO_WALLET_NAME_ALICE: &str = "alice"; const BITCOIN_TEST_WALLET_NAME: &str = "testwallet"; @@ -468,199 +770,64 @@ async fn assert_eventual_balance( tracing::debug!( "Assertion successful! Balance {} is {} {}", current_balance, - ordering_str, - expected - ); - - Result::<_, anyhow::Error>::Ok(()) - }; - - let timeout = Duration::from_secs(10); - - tokio::time::timeout(timeout, assertion) - .await - .with_context(|| { - format!( - "Expected balance to be {} {} after at most {}s but was {}", - ordering_str, - expected, - timeout.as_secs(), - current_balance - ) - })??; - - Ok(()) -} - -#[async_trait] -trait Wallet { - type Amount; - - async fn refresh(&self) -> Result<()>; - async fn get_balance(&self) -> Result; -} - -#[async_trait] -impl Wallet for monero::Wallet { - type Amount = monero::Amount; - - async fn refresh(&self) -> Result<()> { - self.refresh().await?; - - Ok(()) - } - - async fn get_balance(&self) -> Result { - self.get_balance().await - } -} - -#[async_trait] -impl Wallet for bitcoin::Wallet { - type Amount = bitcoin::Amount; - - async fn refresh(&self) -> Result<()> { - self.sync().await - } - - async fn get_balance(&self) -> Result { - self.balance().await - } -} - -pub async fn setup_test(_config: C, testfn: T) -where - T: Fn(TestContext) -> F, - F: Future>, - C: GetConfig, -{ - let cli = Cli::default(); - - let _guard = tracing_subscriber::fmt() - .with_env_filter("warn,swap=debug,monero_harness=debug,monero_rpc=debug,bitcoin_harness=info,testcontainers=info") - .with_test_writer() - .set_default(); - - let env_config = C::get_config(); - - let (monero, containers) = harness::init_containers(&cli).await; - monero.init_miner().await.unwrap(); - - let btc_amount = bitcoin::Amount::from_sat(1_000_000); - let xmr_amount = monero::Amount::from_monero(btc_amount.as_btc() / FixedRate::RATE).unwrap(); - - let alice_starting_balances = - StartingBalances::new(bitcoin::Amount::ZERO, xmr_amount, Some(10)); - - let electrs_rpc_port = containers - .electrs - .get_host_port(harness::electrs::RPC_PORT) - .expect("Could not map electrs rpc port"); - - let alice_seed = Seed::random().unwrap(); - let (alice_bitcoin_wallet, alice_monero_wallet) = init_test_wallets( - MONERO_WALLET_NAME_ALICE, - containers.bitcoind_url.clone(), - &monero, - alice_starting_balances.clone(), - tempdir().unwrap().path(), - electrs_rpc_port, - &alice_seed, - env_config, - ) - .await; - - let alice_listen_port = get_port().expect("Failed to find a free port"); - let alice_listen_address: Multiaddr = format!("/ip4/127.0.0.1/tcp/{}", alice_listen_port) - .parse() - .expect("failed to parse Alice's address"); - - let alice_db_path = tempdir().unwrap().into_path(); - let (alice_handle, alice_swap_handle) = start_alice( - &alice_seed, - alice_db_path.clone(), - alice_listen_address.clone(), - env_config, - alice_bitcoin_wallet.clone(), - alice_monero_wallet.clone(), - ); - - let bob_seed = Seed::random().unwrap(); - let bob_starting_balances = StartingBalances::new(btc_amount * 10, monero::Amount::ZERO, None); - - let (bob_bitcoin_wallet, bob_monero_wallet) = init_test_wallets( - MONERO_WALLET_NAME_BOB, - containers.bitcoind_url, - &monero, - bob_starting_balances.clone(), - tempdir().unwrap().path(), - electrs_rpc_port, - &bob_seed, - env_config, - ) - .await; - - let bob_params = BobParams { - seed: Seed::random().unwrap(), - db_path: tempdir().unwrap().path().to_path_buf(), - bitcoin_wallet: bob_bitcoin_wallet.clone(), - monero_wallet: bob_monero_wallet.clone(), - alice_address: alice_listen_address.clone(), - alice_peer_id: alice_handle.peer_id, - env_config, + ordering_str, + expected + ); + + Result::<_, anyhow::Error>::Ok(()) }; - monero.start_miner().await.unwrap(); + let timeout = Duration::from_secs(10); - let test = TestContext { - env_config, - btc_amount, - xmr_amount, - alice_seed, - alice_db_path, - alice_listen_address, - alice_starting_balances, - alice_bitcoin_wallet, - alice_monero_wallet, - alice_swap_handle, - alice_handle, - bob_params, - bob_starting_balances, - bob_bitcoin_wallet, - bob_monero_wallet, - }; + tokio::time::timeout(timeout, assertion) + .await + .with_context(|| { + format!( + "Expected balance to be {} {} after at most {}s but was {}", + ordering_str, + expected, + timeout.as_secs(), + current_balance + ) + })??; - testfn(test).await.unwrap() + Ok(()) } -fn start_alice( - seed: &Seed, - db_path: PathBuf, - listen_address: Multiaddr, - env_config: Config, - bitcoin_wallet: Arc, - monero_wallet: Arc, -) -> (AliceApplicationHandle, Receiver) { - let db = Arc::new(Database::open(db_path.as_path()).unwrap()); +#[async_trait] +trait Wallet { + type Amount; - let mut swarm = swarm::alice(&seed).unwrap(); - swarm.listen_on(listen_address).unwrap(); + async fn refresh(&self) -> Result<()>; + async fn get_balance(&self) -> Result; +} - let (event_loop, swap_handle) = alice::EventLoop::new( - swarm, - env_config, - bitcoin_wallet, - monero_wallet, - db, - FixedRate::default(), - bitcoin::Amount::ONE_BTC, - ) - .unwrap(); +#[async_trait] +impl Wallet for monero::Wallet { + type Amount = monero::Amount; - let peer_id = event_loop.peer_id(); - let handle = tokio::spawn(event_loop.run()); + async fn refresh(&self) -> Result<()> { + self.refresh().await?; - (AliceApplicationHandle { handle, peer_id }, swap_handle) + Ok(()) + } + + async fn get_balance(&self) -> Result { + self.get_balance().await + } +} + +#[async_trait] +impl Wallet for bitcoin::Wallet { + type Amount = bitcoin::Amount; + + async fn refresh(&self) -> Result<()> { + self.sync().await + } + + async fn get_balance(&self) -> Result { + self.balance().await + } } fn random_prefix() -> String { @@ -677,78 +844,6 @@ fn random_prefix() -> String { chars } -async fn init_containers(cli: &Cli) -> (Monero, Containers<'_>) { - let prefix = random_prefix(); - let bitcoind_name = format!("{}_{}", prefix, "bitcoind"); - let (bitcoind, bitcoind_url) = - init_bitcoind_container(&cli, prefix.clone(), bitcoind_name.clone(), prefix.clone()) - .await - .expect("could not init bitcoind"); - let electrs = init_electrs_container(&cli, prefix.clone(), bitcoind_name, prefix) - .await - .expect("could not init electrs"); - let (monero, monerods) = init_monero_container(&cli).await; - (monero, Containers { - bitcoind_url, - bitcoind, - monerods, - electrs, - }) -} - -async fn init_bitcoind_container( - cli: &Cli, - volume: String, - name: String, - network: String, -) -> Result<(Container<'_, Cli, bitcoind::Bitcoind>, Url)> { - let image = bitcoind::Bitcoind::default().with_volume(volume); - - let run_args = RunArgs::default().with_name(name).with_network(network); - - let docker = cli.run_with_args(image, run_args); - let a = docker - .get_host_port(harness::bitcoind::RPC_PORT) - .context("Could not map bitcoind rpc port")?; - - let bitcoind_url = { - let input = format!( - "http://{}:{}@localhost:{}", - bitcoind::RPC_USER, - bitcoind::RPC_PASSWORD, - a - ); - Url::parse(&input).unwrap() - }; - - init_bitcoind(bitcoind_url.clone(), 5).await?; - - Ok((docker, bitcoind_url.clone())) -} - -pub async fn init_electrs_container( - cli: &Cli, - volume: String, - bitcoind_container_name: String, - network: String, -) -> Result> { - let bitcoind_rpc_addr = format!( - "{}:{}", - bitcoind_container_name, - harness::bitcoind::RPC_PORT - ); - let image = electrs::Electrs::default() - .with_volume(volume) - .with_daemon_rpc_addr(bitcoind_rpc_addr) - .with_tag("latest"); - - let run_args = RunArgs::default().with_network(network); - - let docker = cli.run_with_args(image, run_args); - - Ok(docker) -} - async fn mine(bitcoind_client: Client, reward_address: bitcoin::Address) -> Result<()> { loop { tokio::time::sleep(Duration::from_secs(1)).await; @@ -798,101 +893,6 @@ pub async fn mint(node_url: Url, address: bitcoin::Address, amount: bitcoin::Amo Ok(()) } -async fn init_monero_container( - cli: &Cli, -) -> ( - Monero, - Vec>, -) { - let (monero, monerods) = Monero::new(&cli, vec![ - MONERO_WALLET_NAME_ALICE.to_string(), - MONERO_WALLET_NAME_BOB.to_string(), - ]) - .await - .unwrap(); - - (monero, monerods) -} - -#[allow(clippy::too_many_arguments)] -async fn init_test_wallets( - name: &str, - bitcoind_url: Url, - monero: &Monero, - starting_balances: StartingBalances, - datadir: &Path, - electrum_rpc_port: u16, - seed: &Seed, - env_config: Config, -) -> (Arc, Arc) { - monero - .init_wallet( - name, - starting_balances - .xmr_outputs - .into_iter() - .map(|amount| amount.as_piconero()) - .collect(), - ) - .await - .unwrap(); - - let xmr_wallet = swap::monero::Wallet::connect( - monero.wallet(name).unwrap().client(), - name.to_string(), - env_config, - ) - .await - .unwrap(); - - let electrum_rpc_url = { - let input = format!("tcp://@localhost:{}", electrum_rpc_port); - Url::parse(&input).unwrap() - }; - - let btc_wallet = swap::bitcoin::Wallet::new( - electrum_rpc_url, - datadir, - seed.derive_extended_private_key(env_config.bitcoin_network) - .expect("Could not create extended private key from seed"), - env_config, - ) - .await - .expect("could not init btc wallet"); - - if starting_balances.btc != bitcoin::Amount::ZERO { - mint( - bitcoind_url, - btc_wallet.new_address().await.unwrap(), - starting_balances.btc, - ) - .await - .expect("could not mint btc starting balance"); - - let mut interval = interval(Duration::from_secs(1u64)); - let mut retries = 0u8; - let max_retries = 30u8; - loop { - retries += 1; - btc_wallet.sync().await.unwrap(); - - let btc_balance = btc_wallet.balance().await.unwrap(); - - if btc_balance == starting_balances.btc { - break; - } else if retries == max_retries { - panic!( - "Bitcoin wallet initialization failed, reached max retries upon balance sync" - ) - } - - interval.tick().await; - } - } - - (Arc::new(btc_wallet), Arc::new(xmr_wallet)) -} - // This is just to keep the containers alive #[allow(dead_code)] struct Containers<'a> {