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

Ensure we wait for other party to complete

Browse Source 
Before we check the balances.
This commit is contained in:
Franck Royer 2020-12-21 14:49:19 +11:00
parent 1fa812b727
commit e079b84500
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swap/tests/happy_path_restart_alice.rs
View File

@ -90,7 +90,7 @@ async fn given_alice_restarts_after_encsig_is_learned_resume_swap() {
let alice_db = Database::open(alice_db_datadir.path()).unwrap(); let alice_db = Database::open(alice_db_datadir.path()).unwrap();
tokio::spawn(async move { alice_event_loop.run().await }); tokio::spawn(async move { alice_event_loop.run().await });
tokio::spawn(bob_fut); let bob_swap_handle = tokio::spawn(bob_fut);
tokio::spawn(bob_event_loop.run()); tokio::spawn(bob_event_loop.run());
let alice_swap_id = Uuid::new_v4(); let alice_swap_id = Uuid::new_v4();
@ -136,6 +136,9 @@ async fn given_alice_restarts_after_encsig_is_learned_resume_swap() {
.await .await
.unwrap(); .unwrap();
// Wait for Bob to finish
bob_swap_handle.await.unwrap().unwrap();
assert!(matches!(alice_state, AliceState::BtcRedeemed {..})); assert!(matches!(alice_state, AliceState::BtcRedeemed {..}));
let btc_alice_final = alice_btc_wallet.as_ref().balance().await.unwrap(); let btc_alice_final = alice_btc_wallet.as_ref().balance().await.unwrap();

9
swap/tests/happy_path_restart_bob_after_comm.rs
View File

@ -80,7 +80,7 @@ async fn given_bob_restarts_after_encsig_is_sent_resume_swap() {
let bob_btc_wallet_clone = bob_btc_wallet.clone(); let bob_btc_wallet_clone = bob_btc_wallet.clone();
let bob_xmr_wallet_clone = bob_xmr_wallet.clone(); let bob_xmr_wallet_clone = bob_xmr_wallet.clone();
let _ = tokio::spawn(async move { let alice_swap_handle = tokio::spawn(async move {
alice::swap::swap( alice::swap::swap(
alice_state, alice_state,
alice_event_loop_handle, alice_event_loop_handle,
@ -93,9 +93,9 @@ async fn given_bob_restarts_after_encsig_is_sent_resume_swap() {
.await .await
}); });
let _alice_swarm_fut = tokio::spawn(async move { alice_event_loop.run().await }); tokio::spawn(async move { alice_event_loop.run().await });
let _bob_swarm_fut = tokio::spawn(async move { bob_event_loop.run().await }); tokio::spawn(async move { bob_event_loop.run().await });
let bob_swap_id = Uuid::new_v4(); let bob_swap_id = Uuid::new_v4();
let bob_db_datadir = tempdir().unwrap(); let bob_db_datadir = tempdir().unwrap();
@ -142,6 +142,9 @@ async fn given_bob_restarts_after_encsig_is_sent_resume_swap() {
.await .await
.unwrap(); .unwrap();
// Wait for Alice to finish too
alice_swap_handle.await.unwrap().unwrap();
assert!(matches!(bob_state, BobState::XmrRedeemed {..})); assert!(matches!(bob_state, BobState::XmrRedeemed {..}));
let btc_alice_final = alice_btc_wallet_clone.as_ref().balance().await.unwrap(); let btc_alice_final = alice_btc_wallet_clone.as_ref().balance().await.unwrap();