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

Change multiaddr for test runs

Browse source
This commit is contained in:
rishflab 2020-12-05 14:06:08 +11:00
parent c91e9652aa
commit e4eed7b1a5
1 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
swap/tests/e2e.rs
View file

@ -36,14 +36,20 @@ async fn happy_path() {
let xmr_alice = xmr * 10; let xmr_alice = xmr * 10;
let xmr_bob = 0; let xmr_bob = 0;
let ( let alice_multiaddr: Multiaddr = "/ip4/127.0.0.1/tcp/9876"
alice_state, .parse()
alice_swarm, .expect("failed to parse Alice's address");
alice_btc_wallet,
alice_xmr_wallet, let (alice_state, alice_swarm, alice_btc_wallet, alice_xmr_wallet, alice_peer_id) = init_alice(
alice_peer_id, &bitcoind,
alice_multiaddr, &monero,
) = init_alice(&bitcoind, &monero, btc, btc_alice, xmr, xmr_alice).await; btc,
btc_alice,
xmr,
xmr_alice,
alice_multiaddr.clone(),
)
.await;
let (bob_state, bob_swarm, bob_btc_wallet, bob_xmr_wallet, bob_db) = init_bob( let (bob_state, bob_swarm, bob_btc_wallet, bob_xmr_wallet, bob_db) = init_bob(
alice_multiaddr, alice_multiaddr,
@ -117,20 +123,18 @@ async fn alice_punishes_if_bob_never_acts_after_fund() {
let alice_btc_starting_balance = bitcoin::Amount::ZERO; let alice_btc_starting_balance = bitcoin::Amount::ZERO;
let alice_xmr_starting_balance = xmr_to_swap * 10; let alice_xmr_starting_balance = xmr_to_swap * 10;
let ( let alice_multiaddr: Multiaddr = "/ip4/127.0.0.1/tcp/9877"
alice_state, .parse()
alice_swarm, .expect("failed to parse Alice's address");
alice_btc_wallet,
alice_xmr_wallet, let (alice_state, alice_swarm, alice_btc_wallet, alice_xmr_wallet, alice_peer_id) = init_alice(
alice_peer_id,
alice_multiaddr,
) = init_alice(
&bitcoind, &bitcoind,
&monero, &monero,
btc_to_swap, btc_to_swap,
alice_btc_starting_balance, alice_btc_starting_balance,
xmr_to_swap, xmr_to_swap,
alice_xmr_starting_balance, alice_xmr_starting_balance,
alice_multiaddr.clone(),
) )
.await; .await;
@ -195,13 +199,13 @@ async fn init_alice(
_btc_starting_balance: bitcoin::Amount, _btc_starting_balance: bitcoin::Amount,
xmr_to_swap: u64, xmr_to_swap: u64,
xmr_starting_balance: u64, xmr_starting_balance: u64,
alice_multiaddr: Multiaddr,
) -> ( ) -> (
AliceState, AliceState,
alice::Swarm, alice::Swarm,
Arc<swap::bitcoin::Wallet>, Arc<swap::bitcoin::Wallet>,
Arc<swap::monero::Wallet>, Arc<swap::monero::Wallet>,
PeerId, PeerId,
Multiaddr,
) { ) {
monero monero
.init(vec![("alice", xmr_starting_balance)]) .init(vec![("alice", xmr_starting_balance)])
@ -239,12 +243,7 @@ async fn init_alice(
} }
}; };
let alice_multiaddr: Multiaddr = "/ip4/127.0.0.1/tcp/9876" let alice_swarm = alice::new_swarm(alice_multiaddr, alice_transport, alice_behaviour).unwrap();
.parse()
.expect("failed to parse Alice's address");
let alice_swarm =
alice::new_swarm(alice_multiaddr.clone(), alice_transport, alice_behaviour).unwrap();
( (
alice_state, alice_state,
@ -252,7 +251,6 @@ async fn init_alice(
alice_btc_wallet, alice_btc_wallet,
alice_xmr_wallet, alice_xmr_wallet,
alice_peer_id, alice_peer_id,
alice_multiaddr,
) )
} }