Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Wallet name constants for the e2e test setup

Browse Source 
Container initialization and wallet initialization have to ensure to use the same wallet name.
In order to avoid problems constants are introduced to ensure we use the same wallet name.
This commit is contained in:
Daniel Karzel 2021-03-03 10:58:47 +11:00
parent 2bb1c1e177
commit 5111a12706
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
swap/tests/testutils/mod.rs
View File

@ -33,7 +33,9 @@ use tracing_log::LogTracer;
use url::Url; use url::Url;
use uuid::Uuid; use uuid::Uuid;
const TEST_WALLET_NAME: &str = "testwallet"; const MONERO_WALLET_NAME_BOB: &str = "bob";
const MONERO_WALLET_NAME_ALICE: &str = "alice";
const BITCOIN_TEST_WALLET_NAME: &str = "testwallet";
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct StartingBalances { pub struct StartingBalances {
@ -353,7 +355,7 @@ where
let bob_seed = Seed::random().unwrap(); let bob_seed = Seed::random().unwrap();
let (alice_bitcoin_wallet, alice_monero_wallet) = init_test_wallets( let (alice_bitcoin_wallet, alice_monero_wallet) = init_test_wallets(
"alice", MONERO_WALLET_NAME_ALICE,
containers.bitcoind_url.clone(), containers.bitcoind_url.clone(),
&monero, &monero,
alice_starting_balances.clone(), alice_starting_balances.clone(),
@ -375,7 +377,7 @@ where
}; };
let (bob_bitcoin_wallet, bob_monero_wallet) = init_test_wallets( let (bob_bitcoin_wallet, bob_monero_wallet) = init_test_wallets(
"bob", MONERO_WALLET_NAME_BOB,
containers.bitcoind_url, containers.bitcoind_url,
&monero, &monero,
bob_starting_balances.clone(), bob_starting_balances.clone(),
@ -529,11 +531,11 @@ async fn init_bitcoind(node_url: Url, spendable_quantity: u32) -> Result<Client>
let bitcoind_client = Client::new(node_url.clone()); let bitcoind_client = Client::new(node_url.clone());
bitcoind_client bitcoind_client
.createwallet(TEST_WALLET_NAME, None, None, None, None) .createwallet(BITCOIN_TEST_WALLET_NAME, None, None, None, None)
.await?; .await?;
let reward_address = bitcoind_client let reward_address = bitcoind_client
.with_wallet(TEST_WALLET_NAME)? .with_wallet(BITCOIN_TEST_WALLET_NAME)?
.getnewaddress(None, None) .getnewaddress(None, None)
.await?; .await?;
@ -550,12 +552,12 @@ pub async fn mint(node_url: Url, address: bitcoin::Address, amount: bitcoin::Amo
let bitcoind_client = Client::new(node_url.clone()); let bitcoind_client = Client::new(node_url.clone());
bitcoind_client bitcoind_client
.send_to_address(TEST_WALLET_NAME, address.clone(), amount) .send_to_address(BITCOIN_TEST_WALLET_NAME, address.clone(), amount)
.await?; .await?;
// Confirm the transaction // Confirm the transaction
let reward_address = bitcoind_client let reward_address = bitcoind_client
.with_wallet(TEST_WALLET_NAME)? .with_wallet(BITCOIN_TEST_WALLET_NAME)?
.getnewaddress(None, None) .getnewaddress(None, None)
.await?; .await?;
bitcoind_client bitcoind_client
@ -571,9 +573,12 @@ async fn init_monero_container(
Monero, Monero,
Vec<Container<'_, Cli, monero_harness::image::Monero>>, Vec<Container<'_, Cli, monero_harness::image::Monero>>,
) { ) {
let (monero, monerods) = Monero::new(&cli, None, vec!["alice".to_string(), "bob".to_string()]) let (monero, monerods) = Monero::new(&cli, vec![
.await MONERO_WALLET_NAME_ALICE.to_string(),
.unwrap(); MONERO_WALLET_NAME_BOB.to_string(),
])
.await
.unwrap();
(monero, monerods) (monero, monerods)
} }