Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-11-30 20:46:33 -05:00
Code Issues Projects Releases Packages Wiki Activity

merge with master

Browse source
This commit is contained in:
Lorenzo Tucci 2023-10-01 13:39:43 +03:00
commit 9c79738e69
No known key found for this signature in database
GPG key ID: D98C4FA2CDF590A0
13 changed files with 475 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

6
swap/src/api/request.rs
View file

@ -177,11 +177,11 @@ impl Request {
Method::SuspendCurrentSwap => {
let swap_id = context.swap_lock.get_current_swap_id().await;
if swap_id.is_some() {
if let Some(id_value) = swap_id {
context.swap_lock.send_suspend_signal().await?;
Ok(json!({
"swapId": swap_id.unwrap()
"swapId": id_value
}))
} else {
bail!("No swap is currently running")
@ -624,7 +624,7 @@ impl Request {
}
Method::StartDaemon { server_address } => {
// Default to 127.0.0.1:1234
let server_address = server_address.unwrap_or("127.0.0.1:1234".parse().unwrap());
let server_address = server_address.unwrap_or("127.0.0.1:1234".parse()?);
let (addr, server_handle) =
rpc::run_server(server_address, Arc::clone(&context)).await?;