Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-05 21:14:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix the test setup

Browse source
This commit is contained in:
Daniel Karzel 2021-02-10 10:21:05 +11:00
parent eb310be2c0
commit 982ce4ff04
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
swap/tests/testutils/mod.rs
View file

@ -339,6 +339,9 @@ where
btc: bitcoin::Amount::ZERO, btc: bitcoin::Amount::ZERO,
}; };
let alice_seed = Seed::random().unwrap();
let bob_seed = Seed::random().unwrap();
let port = get_port().expect("Failed to find a free port"); let port = get_port().expect("Failed to find a free port");
let listen_address: Multiaddr = format!("/ip4/127.0.0.1/tcp/{}", port) let listen_address: Multiaddr = format!("/ip4/127.0.0.1/tcp/{}", port)
@ -362,11 +365,12 @@ where
tempdir().unwrap().path(), tempdir().unwrap().path(),
electrs_rpc_port, electrs_rpc_port,
electrs_http_port, electrs_http_port,
alice_seed,
) )
.await; .await;
let alice_params = AliceParams { let alice_params = AliceParams {
seed: Seed::random().unwrap(), seed: alice_seed,
execution_params, execution_params,
swap_id: Uuid::new_v4(), swap_id: Uuid::new_v4(),
bitcoin_wallet: alice_bitcoin_wallet.clone(), bitcoin_wallet: alice_bitcoin_wallet.clone(),
@ -388,11 +392,12 @@ where
tempdir().unwrap().path(), tempdir().unwrap().path(),
electrs_rpc_port, electrs_rpc_port,
electrs_http_port, electrs_http_port,
bob_seed,
) )
.await; .await;
let bob_params = BobParams { let bob_params = BobParams {
seed: Seed::random().unwrap(), seed: bob_seed,
db_path: tempdir().unwrap().path().to_path_buf(), db_path: tempdir().unwrap().path().to_path_buf(),
swap_id: Uuid::new_v4(), swap_id: Uuid::new_v4(),
bitcoin_wallet: bob_bitcoin_wallet.clone(), bitcoin_wallet: bob_bitcoin_wallet.clone(),
@ -566,6 +571,7 @@ async fn init_monero_container(
(monero, monerods) (monero, monerods)
} }
#[allow(clippy::too_many_arguments)]
async fn init_test_wallets( async fn init_test_wallets(
name: &str, name: &str,
bitcoind_url: Url, bitcoind_url: Url,
@ -574,6 +580,7 @@ async fn init_test_wallets(
datadir: &Path, datadir: &Path,
electrum_rpc_port: u16, electrum_rpc_port: u16,
electrum_http_port: u16, electrum_http_port: u16,
seed: Seed,
) -> (Arc<bitcoin::Wallet>, Arc<monero::Wallet>) { ) -> (Arc<bitcoin::Wallet>, Arc<monero::Wallet>) {
monero monero
.init(vec![(name, starting_balances.xmr.as_piconero())]) .init(vec![(name, starting_balances.xmr.as_piconero())])
@ -594,12 +601,15 @@ async fn init_test_wallets(
Url::parse(&input).unwrap() Url::parse(&input).unwrap()
}; };
let priv_key = seed.root_private_key(bitcoin::Network::Regtest);
let btc_wallet = Arc::new( let btc_wallet = Arc::new(
swap::bitcoin::Wallet::new( swap::bitcoin::Wallet::new(
electrum_rpc_url, electrum_rpc_url,
electrum_http_url, electrum_http_url,
bitcoin::Network::Regtest, bitcoin::Network::Regtest,
datadir, datadir,
priv_key,
) )
.await .await
.expect("could not init btc wallet"), .expect("could not init btc wallet"),