From 9a930af33fd9cafbe7aac6ef74649481cf7af48e Mon Sep 17 00:00:00 2001
From: Daniel Karzel <daniel@comit.network>
Date: Mon, 14 Dec 2020 21:33:52 +1100
Subject: [PATCH] Remove duplicated restart+refund test, move tests into
 separate files

---
 ..._safe_restart.rs => happy_path_restart.rs} | 122 ------------------
 swap/tests/{refund.rs => refund_restart.rs}   |   0
 2 files changed, 122 deletions(-)
 rename swap/tests/{alice_safe_restart.rs => happy_path_restart.rs} (50%)
 rename swap/tests/{refund.rs => refund_restart.rs} (100%)

diff --git a/swap/tests/alice_safe_restart.rs b/swap/tests/happy_path_restart.rs
similarity index 50%
rename from swap/tests/alice_safe_restart.rs
rename to swap/tests/happy_path_restart.rs
index eabc5403..f34deeef 100644
--- a/swap/tests/alice_safe_restart.rs
+++ b/swap/tests/happy_path_restart.rs
@@ -128,125 +128,3 @@ async fn given_alice_restarts_after_encsig_is_learned_resume_swap() {
 
     // TODO: Additionally assert balances
 }
-
-// If Alice stops before learning the encsig that Bob sent, she has to refund
-// because the connection with Bob is not re-dialed at the moment!
-// TODO: Alice goes till "Alice acknowledged message 3 received" which is a bit
-//  awkward. Validate that that this is printed, but the state not saved.
-#[tokio::test]
-async fn given_alice_restarts_after_xmr_is_locked_refund_swap() {
-    let _guard = init_tracing();
-
-    let cli = Cli::default();
-    let (
-        monero,
-        testutils::Containers {
-            bitcoind,
-            monerods: _monerods,
-        },
-    ) = testutils::init_containers(&cli).await;
-
-    let btc_to_swap = bitcoin::Amount::from_sat(1_000_000);
-    let xmr_to_swap = xmr_btc::monero::Amount::from_piconero(1_000_000_000_000);
-
-    let bob_btc_starting_balance = btc_to_swap * 10;
-    let alice_xmr_starting_balance = xmr_to_swap * 10;
-
-    let alice_multiaddr: Multiaddr = "/ip4/127.0.0.1/tcp/9877"
-        .parse()
-        .expect("failed to parse Alice's address");
-
-    let config = Config::regtest();
-
-    let (
-        start_state,
-        mut alice_event_loop,
-        alice_event_loop_handle,
-        alice_btc_wallet,
-        alice_xmr_wallet,
-    ) = init_alice(
-        &bitcoind,
-        &monero,
-        btc_to_swap,
-        xmr_to_swap,
-        alice_xmr_starting_balance,
-        alice_multiaddr.clone(),
-        config,
-    )
-    .await;
-
-    let (bob_state, bob_event_loop, bob_event_loop_handle, bob_btc_wallet, bob_xmr_wallet, bob_db) =
-        init_bob(
-            alice_multiaddr.clone(),
-            &bitcoind,
-            &monero,
-            btc_to_swap,
-            bob_btc_starting_balance,
-            xmr_to_swap,
-            config,
-        )
-        .await;
-
-    let _ = tokio::spawn(async move {
-        bob::swap::swap(
-            bob_state,
-            bob_event_loop_handle,
-            bob_db,
-            bob_btc_wallet.clone(),
-            bob_xmr_wallet.clone(),
-            OsRng,
-            Uuid::new_v4(),
-        )
-        .await
-    });
-
-    let _bob_swarm_fut = tokio::spawn(async move { bob_event_loop.run().await });
-
-    let alice_db_datadir = tempdir().unwrap();
-    let alice_db = Database::open(alice_db_datadir.path()).unwrap();
-
-    let _alice_swarm_fut = tokio::spawn(async move { alice_event_loop.run().await });
-
-    let alice_swap_id = Uuid::new_v4();
-
-    let alice_state = alice::swap::run_until(
-        start_state,
-        alice::swap::is_xmr_locked,
-        alice_event_loop_handle,
-        alice_btc_wallet.clone(),
-        alice_xmr_wallet.clone(),
-        Config::regtest(),
-        alice_swap_id,
-        alice_db,
-    )
-    .await
-    .unwrap();
-
-    assert!(matches!(alice_state, AliceState::XmrLocked {..}));
-
-    let alice_db = Database::open(alice_db_datadir.path()).unwrap();
-    let state_before_restart = alice_db.get_state(alice_swap_id).unwrap();
-
-    if let swap::state::Swap::Alice(state) = state_before_restart.clone() {
-        assert!(matches!(state, swap::state::Alice::XmrLocked {..}));
-    }
-
-    let (mut event_loop_after_restart, event_loop_handle_after_restart) =
-        testutils::init_alice_eventloop(alice_multiaddr);
-    let _alice_swarm_fut = tokio::spawn(async move { event_loop_after_restart.run().await });
-
-    let alice_state = alice::swap::recover(
-        event_loop_handle_after_restart,
-        alice_btc_wallet,
-        alice_xmr_wallet,
-        Config::regtest(),
-        alice_swap_id,
-        alice_db,
-    )
-    .await
-    .unwrap();
-
-    assert!(matches!(alice_state, AliceState::XmrRefunded {..}));
-
-    // TODO: Additionally assert balances
-}
diff --git a/swap/tests/refund.rs b/swap/tests/refund_restart.rs
similarity index 100%
rename from swap/tests/refund.rs
rename to swap/tests/refund_restart.rs