From 96cc194b4682d280a97fefef80ed65ce80034514 Mon Sep 17 00:00:00 2001
From: binarybaron <86064887+binarybaron@users.noreply.github.com>
Date: Wed, 9 Aug 2023 22:49:13 +0200
Subject: [PATCH] Pass server_address properly to RpcServer

---
 swap/src/api/request.rs | 6 ++----
 swap/src/cli/command.rs | 5 ++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/swap/src/api/request.rs b/swap/src/api/request.rs
index 52fcce72..6483175d 100644
--- a/swap/src/api/request.rs
+++ b/swap/src/api/request.rs
@@ -331,10 +331,8 @@ impl Request {
                 }))
             }
             Method::StartDaemon => {
-                let server_address = match self.params.server_address {
-                    Some(address) => address,
-                    None => "127.0.0.1:3456".parse()?,
-                };
+                // Default to 127.0.0.1:1234
+                let server_address = self.params.server_address.unwrap_or("127.0.0.1:1234".parse().unwrap());
 
                 let (_, server_handle) =
                     rpc::run_server(server_address, Arc::clone(&context)).await?;
diff --git a/swap/src/cli/command.rs b/swap/src/cli/command.rs
index 5dfaa14d..a68e8b04 100644
--- a/swap/src/cli/command.rs
+++ b/swap/src/cli/command.rs
@@ -136,7 +136,10 @@ where
             monero,
             tor,
         } => {
-            let request = Request::new(rx.subscribe(), Method::StartDaemon, Params::default());
+            let request = Request::new(rx.subscribe(), Method::StartDaemon, Params {
+                server_address,
+                ..Default::default()
+            });
 
             let context = Context::build(
                 Some(bitcoin),