Rename testutils to harness

This allows us to bring in a dependency named `testutils`.

swap/tests/bob_refunds_using_cancel_and_refund_command.rs

@@ -1,13 +1,13 @@
-pub mod testutils;
+pub mod harness;
 
+use harness::bob_run_until::is_btc_locked;
+use harness::FastCancelConfig;
 use swap::protocol::bob::BobState;
 use swap::protocol::{alice, bob};
-use testutils::bob_run_until::is_btc_locked;
-use testutils::FastCancelConfig;
 
 #[tokio::test]
 async fn given_bob_manually_refunds_after_btc_locked_bob_refunds() {
-    testutils::setup_test(FastCancelConfig, |mut ctx| async move {
+    harness::setup_test(FastCancelConfig, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
 

swap/tests/bob_refunds_using_cancel_and_refund_command_timelock_not_expired.rs

@@ -1,14 +1,14 @@
-pub mod testutils;
+pub mod harness;
 
 use bob::cancel::Error;
+use harness::bob_run_until::is_btc_locked;
+use harness::SlowCancelConfig;
 use swap::protocol::bob::BobState;
 use swap::protocol::{alice, bob};
-use testutils::bob_run_until::is_btc_locked;
-use testutils::SlowCancelConfig;
 
 #[tokio::test]
 async fn given_bob_manually_cancels_when_timelock_not_expired_errors() {
-    testutils::setup_test(SlowCancelConfig, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
 

swap/tests/bob_refunds_using_cancel_and_refund_command_timelock_not_expired_force.rs

@@ -1,13 +1,13 @@
-pub mod testutils;
+pub mod harness;
 
+use harness::bob_run_until::is_btc_locked;
+use harness::SlowCancelConfig;
 use swap::protocol::bob::BobState;
 use swap::protocol::{alice, bob};
-use testutils::bob_run_until::is_btc_locked;
-use testutils::SlowCancelConfig;
 
 #[tokio::test]
 async fn given_bob_manually_forces_cancel_when_timelock_not_expired_errors() {
-    testutils::setup_test(SlowCancelConfig, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
 

swap/tests/happy_path.rs

@@ -1,14 +1,14 @@
-pub mod testutils;
+pub mod harness;
 
+use harness::SlowCancelConfig;
 use swap::protocol::{alice, bob};
-use testutils::SlowCancelConfig;
 use tokio::join;
 
 /// Run the following tests with RUST_MIN_STACK=10000000
 
 #[tokio::test]
 async fn happy_path() {
-    testutils::setup_test(SlowCancelConfig, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, |mut ctx| async move {
         let (bob_swap, _) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run(bob_swap));
 

swap/tests/happy_path_restart_bob_after_xmr_locked.rs

@@ -1,13 +1,13 @@
-pub mod testutils;
+pub mod harness;
 
+use harness::bob_run_until::is_xmr_locked;
+use harness::SlowCancelConfig;
 use swap::protocol::bob::BobState;
 use swap::protocol::{alice, bob};
-use testutils::bob_run_until::is_xmr_locked;
-use testutils::SlowCancelConfig;
 
 #[tokio::test]
 async fn given_bob_restarts_after_xmr_is_locked_resume_swap() {
-    testutils::setup_test(SlowCancelConfig, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_xmr_locked));
 

swap/tests/happy_path_restart_bob_before_xmr_locked.rs

@@ -1,13 +1,13 @@
-pub mod testutils;
+pub mod harness;
 
+use harness::bob_run_until::is_xmr_locked;
+use harness::SlowCancelConfig;
 use swap::protocol::bob::BobState;
 use swap::protocol::{alice, bob};
-use testutils::bob_run_until::is_xmr_locked;
-use testutils::SlowCancelConfig;
 
 #[tokio::test]
 async fn given_bob_restarts_after_xmr_is_locked_resume_swap() {
-    testutils::setup_test(SlowCancelConfig, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_xmr_locked));
 

swap/tests/harness/electrs.rs

@@ -1,4 +1,4 @@
-use crate::testutils::bitcoind;
+use crate::harness::bitcoind;
 use bitcoin::Network;
 use std::collections::HashMap;
 use testcontainers::core::{Container, Docker, WaitForMessage};

swap/tests/harness/mod.rs

@@ -1,7 +1,7 @@
 mod bitcoind;
 mod electrs;
 
-use crate::testutils;
+use crate::harness;
 use anyhow::{bail, Context, Result};
 use async_trait::async_trait;
 use bitcoin_harness::{BitcoindRpcApi, Client};
@@ -452,7 +452,7 @@ where
 
     let env_config = C::get_config();
 
-    let (monero, containers) = testutils::init_containers(&cli).await;
+    let (monero, containers) = harness::init_containers(&cli).await;
 
     let btc_amount = bitcoin::Amount::from_sat(1_000_000);
     let xmr_amount = monero::Amount::from_monero(btc_amount.as_btc() / FixedRate::RATE).unwrap();
@@ -470,7 +470,7 @@ where
 
     let electrs_rpc_port = containers
         .electrs
-        .get_host_port(testutils::electrs::RPC_PORT)
+        .get_host_port(harness::electrs::RPC_PORT)
         .expect("Could not map electrs rpc port");
 
     let alice_seed = Seed::random().unwrap();
@@ -600,7 +600,7 @@ async fn init_bitcoind_container(
 
     let docker = cli.run_with_args(image, run_args);
     let a = docker
-        .get_host_port(testutils::bitcoind::RPC_PORT)
+        .get_host_port(harness::bitcoind::RPC_PORT)
         .context("Could not map bitcoind rpc port")?;
 
     let bitcoind_url = {
@@ -627,7 +627,7 @@ pub async fn init_electrs_container(
     let bitcoind_rpc_addr = format!(
         "{}:{}",
         bitcoind_container_name,
-        testutils::bitcoind::RPC_PORT
+        harness::bitcoind::RPC_PORT
     );
     let image = electrs::Electrs::default()
         .with_volume(volume)

swap/tests/punish.rs

@@ -1,15 +1,15 @@
-pub mod testutils;
+pub mod harness;
 
+use harness::bob_run_until::is_btc_locked;
+use harness::FastPunishConfig;
 use swap::protocol::bob::BobState;
 use swap::protocol::{alice, bob};
-use testutils::bob_run_until::is_btc_locked;
-use testutils::FastPunishConfig;
 
 /// Bob locks Btc and Alice locks Xmr. Bob does not act; he fails to send Alice
 /// the encsig and fail to refund or redeem. Alice punishes.
 #[tokio::test]
 async fn alice_punishes_if_bob_never_acts_after_fund() {
-    testutils::setup_test(FastPunishConfig, |mut ctx| async move {
+    harness::setup_test(FastPunishConfig, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));