|
|
|
@ -28,7 +28,7 @@ use swap::seed::Seed;
|
|
|
|
use swap::{asb, bitcoin, cli, env, monero};
|
|
|
|
use swap::{asb, bitcoin, cli, env, monero};
|
|
|
|
use tempfile::{tempdir, NamedTempFile};
|
|
|
|
use tempfile::{tempdir, NamedTempFile};
|
|
|
|
use testcontainers::clients::Cli;
|
|
|
|
use testcontainers::clients::Cli;
|
|
|
|
use testcontainers::{Container, Docker, RunArgs};
|
|
|
|
use testcontainers::{Container, RunnableImage};
|
|
|
|
use tokio::sync::mpsc;
|
|
|
|
use tokio::sync::mpsc;
|
|
|
|
use tokio::sync::mpsc::Receiver;
|
|
|
|
use tokio::sync::mpsc::Receiver;
|
|
|
|
use tokio::task::JoinHandle;
|
|
|
|
use tokio::task::JoinHandle;
|
|
|
|
@ -61,10 +61,7 @@ where
|
|
|
|
let alice_starting_balances =
|
|
|
|
let alice_starting_balances =
|
|
|
|
StartingBalances::new(bitcoin::Amount::ZERO, xmr_amount, Some(10));
|
|
|
|
StartingBalances::new(bitcoin::Amount::ZERO, xmr_amount, Some(10));
|
|
|
|
|
|
|
|
|
|
|
|
let electrs_rpc_port = containers
|
|
|
|
let electrs_rpc_port = containers.electrs.get_host_port_ipv4(electrs::RPC_PORT);
|
|
|
|
.electrs
|
|
|
|
|
|
|
|
.get_host_port(electrs::RPC_PORT)
|
|
|
|
|
|
|
|
.expect("Could not map electrs rpc port");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let alice_seed = Seed::random().unwrap();
|
|
|
|
let alice_seed = Seed::random().unwrap();
|
|
|
|
let (alice_bitcoin_wallet, alice_monero_wallet) = init_test_wallets(
|
|
|
|
let (alice_bitcoin_wallet, alice_monero_wallet) = init_test_wallets(
|
|
|
|
@ -146,14 +143,14 @@ where
|
|
|
|
async fn init_containers(cli: &Cli) -> (Monero, Containers<'_>) {
|
|
|
|
async fn init_containers(cli: &Cli) -> (Monero, Containers<'_>) {
|
|
|
|
let prefix = random_prefix();
|
|
|
|
let prefix = random_prefix();
|
|
|
|
let bitcoind_name = format!("{}_{}", prefix, "bitcoind");
|
|
|
|
let bitcoind_name = format!("{}_{}", prefix, "bitcoind");
|
|
|
|
let (bitcoind, bitcoind_url) =
|
|
|
|
let (_bitcoind, bitcoind_url, mapped_port) =
|
|
|
|
init_bitcoind_container(cli, prefix.clone(), bitcoind_name.clone(), prefix.clone())
|
|
|
|
init_bitcoind_container(cli, prefix.clone(), bitcoind_name.clone(), prefix.clone())
|
|
|
|
.await
|
|
|
|
.await
|
|
|
|
.expect("could not init bitcoind");
|
|
|
|
.expect("could not init bitcoind");
|
|
|
|
let electrs = init_electrs_container(cli, prefix.clone(), bitcoind_name, prefix)
|
|
|
|
let electrs = init_electrs_container(cli, prefix.clone(), bitcoind_name, prefix, mapped_port)
|
|
|
|
.await
|
|
|
|
.await
|
|
|
|
.expect("could not init electrs");
|
|
|
|
.expect("could not init electrs");
|
|
|
|
let (monero, monerod_container, monero_wallet_rpc_containers) =
|
|
|
|
let (monero, _monerod_container, _monero_wallet_rpc_containers) =
|
|
|
|
Monero::new(cli, vec![MONERO_WALLET_NAME_ALICE, MONERO_WALLET_NAME_BOB])
|
|
|
|
Monero::new(cli, vec![MONERO_WALLET_NAME_ALICE, MONERO_WALLET_NAME_BOB])
|
|
|
|
.await
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
.unwrap();
|
|
|
|
@ -162,9 +159,9 @@ async fn init_containers(cli: &Cli) -> (Monero, Containers<'_>) {
|
|
|
|
monero,
|
|
|
|
monero,
|
|
|
|
Containers {
|
|
|
|
Containers {
|
|
|
|
bitcoind_url,
|
|
|
|
bitcoind_url,
|
|
|
|
bitcoind,
|
|
|
|
_bitcoind,
|
|
|
|
monerod_container,
|
|
|
|
_monerod_container,
|
|
|
|
monero_wallet_rpc_containers,
|
|
|
|
_monero_wallet_rpc_containers,
|
|
|
|
electrs,
|
|
|
|
electrs,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
|
|
|
)
|
|
|
|
@ -175,29 +172,28 @@ async fn init_bitcoind_container(
|
|
|
|
volume: String,
|
|
|
|
volume: String,
|
|
|
|
name: String,
|
|
|
|
name: String,
|
|
|
|
network: String,
|
|
|
|
network: String,
|
|
|
|
) -> Result<(Container<'_, Cli, bitcoind::Bitcoind>, Url)> {
|
|
|
|
) -> Result<(Container<'_, bitcoind::Bitcoind>, Url, u16)> {
|
|
|
|
let image = bitcoind::Bitcoind::default().with_volume(volume);
|
|
|
|
let image = bitcoind::Bitcoind::default().with_volume(volume);
|
|
|
|
|
|
|
|
let image = RunnableImage::from(image)
|
|
|
|
|
|
|
|
.with_container_name(name)
|
|
|
|
|
|
|
|
.with_network(network);
|
|
|
|
|
|
|
|
|
|
|
|
let run_args = RunArgs::default().with_name(name).with_network(network);
|
|
|
|
let docker = cli.run(image);
|
|
|
|
|
|
|
|
let port = docker.get_host_port_ipv4(bitcoind::RPC_PORT);
|
|
|
|
let docker = cli.run_with_args(image, run_args);
|
|
|
|
|
|
|
|
let a = docker
|
|
|
|
|
|
|
|
.get_host_port(bitcoind::RPC_PORT)
|
|
|
|
|
|
|
|
.context("Could not map bitcoind rpc port")?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let bitcoind_url = {
|
|
|
|
let bitcoind_url = {
|
|
|
|
let input = format!(
|
|
|
|
let input = format!(
|
|
|
|
"http://{}:{}@localhost:{}",
|
|
|
|
"http://{}:{}@localhost:{}",
|
|
|
|
bitcoind::RPC_USER,
|
|
|
|
bitcoind::RPC_USER,
|
|
|
|
bitcoind::RPC_PASSWORD,
|
|
|
|
bitcoind::RPC_PASSWORD,
|
|
|
|
a
|
|
|
|
port
|
|
|
|
);
|
|
|
|
);
|
|
|
|
Url::parse(&input).unwrap()
|
|
|
|
Url::parse(&input).unwrap()
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
init_bitcoind(bitcoind_url.clone(), 5).await?;
|
|
|
|
init_bitcoind(bitcoind_url.clone(), 5).await?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok((docker, bitcoind_url.clone()))
|
|
|
|
Ok((docker, bitcoind_url.clone(), bitcoind::RPC_PORT))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub async fn init_electrs_container(
|
|
|
|
pub async fn init_electrs_container(
|
|
|
|
@ -205,16 +201,18 @@ pub async fn init_electrs_container(
|
|
|
|
volume: String,
|
|
|
|
volume: String,
|
|
|
|
bitcoind_container_name: String,
|
|
|
|
bitcoind_container_name: String,
|
|
|
|
network: String,
|
|
|
|
network: String,
|
|
|
|
) -> Result<Container<'_, Cli, electrs::Electrs>> {
|
|
|
|
port: u16,
|
|
|
|
let bitcoind_rpc_addr = format!("{}:{}", bitcoind_container_name, bitcoind::RPC_PORT);
|
|
|
|
) -> Result<Container<'_, electrs::Electrs>> {
|
|
|
|
|
|
|
|
let bitcoind_rpc_addr = format!("{}:{}", bitcoind_container_name, port);
|
|
|
|
let image = electrs::Electrs::default()
|
|
|
|
let image = electrs::Electrs::default()
|
|
|
|
.with_volume(volume)
|
|
|
|
.with_volume(volume)
|
|
|
|
.with_daemon_rpc_addr(bitcoind_rpc_addr)
|
|
|
|
.with_daemon_rpc_addr(bitcoind_rpc_addr)
|
|
|
|
.with_tag("latest");
|
|
|
|
.with_tag("latest");
|
|
|
|
|
|
|
|
let image = RunnableImage::from(image.self_and_args())
|
|
|
|
|
|
|
|
.with_network(network.clone())
|
|
|
|
|
|
|
|
.with_container_name(format!("{}_electrs", network));
|
|
|
|
|
|
|
|
|
|
|
|
let run_args = RunArgs::default().with_network(network);
|
|
|
|
let docker = cli.run(image);
|
|
|
|
|
|
|
|
|
|
|
|
let docker = cli.run_with_args(image, run_args);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(docker)
|
|
|
|
Ok(docker)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -952,13 +950,12 @@ pub async fn mint(node_url: Url, address: bitcoin::Address, amount: bitcoin::Amo
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// This is just to keep the containers alive
|
|
|
|
// This is just to keep the containers alive
|
|
|
|
#[allow(dead_code)]
|
|
|
|
|
|
|
|
struct Containers<'a> {
|
|
|
|
struct Containers<'a> {
|
|
|
|
bitcoind_url: Url,
|
|
|
|
bitcoind_url: Url,
|
|
|
|
bitcoind: Container<'a, Cli, bitcoind::Bitcoind>,
|
|
|
|
_bitcoind: Container<'a, bitcoind::Bitcoind>,
|
|
|
|
monerod_container: Container<'a, Cli, image::Monerod>,
|
|
|
|
_monerod_container: Container<'a, image::Monerod>,
|
|
|
|
monero_wallet_rpc_containers: Vec<Container<'a, Cli, image::MoneroWalletRpc>>,
|
|
|
|
_monero_wallet_rpc_containers: Vec<Container<'a, image::MoneroWalletRpc>>,
|
|
|
|
electrs: Container<'a, Cli, electrs::Electrs>,
|
|
|
|
electrs: Container<'a, electrs::Electrs>,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub mod alice_run_until {
|
|
|
|
pub mod alice_run_until {
|
|
|
|
|
Ian McKenzie
3 months ago
committed by
GitHub