|
|
|
@ -80,22 +80,19 @@ async fn given_bob_restarts_after_encsig_is_sent_resume_swap() {
|
|
|
|
|
let bob_btc_wallet_clone = bob_btc_wallet.clone();
|
|
|
|
|
let bob_xmr_wallet_clone = bob_xmr_wallet.clone();
|
|
|
|
|
|
|
|
|
|
let _ = tokio::spawn(async move {
|
|
|
|
|
alice::swap::swap(
|
|
|
|
|
alice_state,
|
|
|
|
|
alice_event_loop_handle,
|
|
|
|
|
alice_btc_wallet.clone(),
|
|
|
|
|
alice_xmr_wallet.clone(),
|
|
|
|
|
config,
|
|
|
|
|
Uuid::new_v4(),
|
|
|
|
|
alice_db,
|
|
|
|
|
)
|
|
|
|
|
.await
|
|
|
|
|
});
|
|
|
|
|
let alice_swap_handle = tokio::spawn(alice::swap::swap(
|
|
|
|
|
alice_state,
|
|
|
|
|
alice_event_loop_handle,
|
|
|
|
|
alice_btc_wallet.clone(),
|
|
|
|
|
alice_xmr_wallet.clone(),
|
|
|
|
|
config,
|
|
|
|
|
Uuid::new_v4(),
|
|
|
|
|
alice_db,
|
|
|
|
|
));
|
|
|
|
|
|
|
|
|
|
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(bob_event_loop.run());
|
|
|
|
|
|
|
|
|
|
let bob_swap_id = Uuid::new_v4();
|
|
|
|
|
let bob_db_datadir = tempdir().unwrap();
|
|
|
|
@ -125,7 +122,7 @@ async fn given_bob_restarts_after_encsig_is_sent_resume_swap() {
|
|
|
|
|
|
|
|
|
|
let (event_loop_after_restart, event_loop_handle_after_restart) =
|
|
|
|
|
testutils::init_bob_event_loop(alice_peer_id, alice_multiaddr);
|
|
|
|
|
let _bob_swarm_fut = tokio::spawn(async move { event_loop_after_restart.run().await });
|
|
|
|
|
tokio::spawn(event_loop_after_restart.run());
|
|
|
|
|
|
|
|
|
|
let db_swap = bob_db.get_state(bob_swap_id).unwrap();
|
|
|
|
|
let resume_state = BobState::try_from(db_swap).unwrap();
|
|
|
|
@ -142,6 +139,9 @@ async fn given_bob_restarts_after_encsig_is_sent_resume_swap() {
|
|
|
|
|
.await
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
// Wait for Alice to finish too
|
|
|
|
|
alice_swap_handle.await.unwrap().unwrap();
|
|
|
|
|
|
|
|
|
|
assert!(matches!(bob_state, BobState::XmrRedeemed {..}));
|
|
|
|
|
|
|
|
|
|
let btc_alice_final = alice_btc_wallet_clone.as_ref().balance().await.unwrap();
|
|
|
|
|