fix(tests): harness (#781)

monero-sys/Cargo.toml

@@ -10,18 +10,13 @@ chrono = { version = "0.4", features = ["serde"] }
 cxx = "1.0.137"
 monero = { workspace = true }
 serde = { workspace = true }
-sqlx = { version = "0.8", features = [
+sqlx = { version = "0.8", features = ["sqlite", "runtime-tokio-rustls", "macros", "chrono"] }
-    "sqlite",
+thiserror = "2.0.17"
-    "runtime-tokio-rustls",
-    "macros",
-    "chrono",
-] }
 tokio = { workspace = true, features = ["sync", "time", "rt"] }
 tracing = { workspace = true }
 typeshare = { workspace = true }
 url = { workspace = true }
 uuid = { workspace = true }
-thiserror = "2.0.17"
 
 # Our crates
 swap-serde = { path = "../swap-serde" }

swap-env/src/prompt.rs

@@ -1,15 +1,15 @@
 use std::path::{Path, PathBuf};
 
 use crate::defaults::{
-    DEFAULT_MAX_BUY_AMOUNT, DEFAULT_MIN_BUY_AMOUNT, DEFAULT_SPREAD, default_rendezvous_points,
+    default_rendezvous_points, DEFAULT_MAX_BUY_AMOUNT, DEFAULT_MIN_BUY_AMOUNT, DEFAULT_SPREAD,
 };
-use anyhow::{Context, Result, bail};
+use anyhow::{bail, Context, Result};
 use console::Style;
 use dialoguer::Confirm;
-use dialoguer::{Input, Select, theme::ColorfulTheme};
+use dialoguer::{theme::ColorfulTheme, Input, Select};
 use libp2p::Multiaddr;
-use rust_decimal::Decimal;
 use rust_decimal::prelude::FromPrimitive;
+use rust_decimal::Decimal;
 use url::Url;
 
 /// Prompt user for data directory

swap-p2p/src/protocols/quotes_cached.rs

@@ -1,4 +1,4 @@
-use crate::behaviour_util::{AddressTracker};
+use crate::behaviour_util::AddressTracker;
 use crate::futures_util::FuturesHashSet;
 use crate::out_event;
 use crate::protocols::quote::BidQuote;

swap-p2p/src/protocols/rendezvous.rs

@@ -79,7 +79,7 @@ mod tests {
         registrar.listen_on_random_memory_address().await;
         let registrar_id = *registrar.local_peer_id();
 
-        // Create peer that discovers the 
+        // Create peer that discovers the
         let mut discoverer = new_swarm(|identity| {
             discovery::Behaviour::new(
                 identity,

swap/src/cli/command.rs

@@ -1,6 +1,6 @@
 use crate::cli::api::request::{
-    BalanceArgs, CancelAndRefundArgs, ExportBitcoinWalletArgs, GetConfigArgs,
+    BalanceArgs, CancelAndRefundArgs, ExportBitcoinWalletArgs, GetConfigArgs, GetHistoryArgs,
-    GetHistoryArgs, MoneroRecoveryArgs, Request, ResumeSwapArgs, WithdrawBtcArgs,
+    MoneroRecoveryArgs, Request, ResumeSwapArgs, WithdrawBtcArgs,
 };
 use crate::cli::api::Context;
 use crate::monero::{self, MoneroAddressPool};

swap/tests/harness/mod.rs

@@ -103,6 +103,7 @@ pub async fn setup_test<T, F, C>(
         .await
         .main_address()
         .await
+        .unwrap()
         .into();
 
     let developer_tip_monero_wallet_subaddress = developer_tip_monero_wallet
@@ -384,7 +385,7 @@ async fn init_test_wallets(
 
     let xmr_wallet = wallets.main_wallet().await;
     tracing::info!(
-        address = %xmr_wallet.main_address().await,
+        address = %xmr_wallet.main_address().await.unwrap(),
         "Initialized monero wallet"
     );
 
@@ -534,7 +535,12 @@ impl BobParams {
     pub async fn get_change_receive_addresses(&self) -> (bitcoin::Address, monero::Address) {
         (
             self.bitcoin_wallet.new_address().await.unwrap(),
-            self.monero_wallet.main_wallet().await.main_address().await,
+            self.monero_wallet
+                .main_wallet()
+                .await
+                .main_address()
+                .await
+                .unwrap(),
         )
     }
 
@@ -563,6 +569,7 @@ impl BobParams {
                 .await
                 .main_address()
                 .await
+                .unwrap()
                 .into(),
         )
         .await
@@ -603,6 +610,7 @@ impl BobParams {
                 .await
                 .main_address()
                 .await
+                .unwrap()
                 .into(),
             self.bitcoin_wallet.new_address().await?,
             btc_amount,
@@ -628,7 +636,7 @@ impl BobParams {
         let mut swarm = swarm::cli(identity.clone(), None, behaviour).await?;
         swarm.add_peer_address(self.alice_peer_id, self.alice_address.clone());
 
-        cli::EventLoop::new(swarm, db.clone())
+        cli::EventLoop::new(swarm, db.clone(), None)
     }
 }