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

merging master changes

Browse source
This commit is contained in:
Lorenzo Tucci 2023-01-11 13:36:03 +01:00
commit 925c7bc179
No known key found for this signature in database
GPG key ID: D98C4FA2CDF590A0
37 changed files with 279 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -377,17 +377,10 @@ impl Request {
"result": []
})
}
Method::Cancel => {
Method::CancelAndRefund => {
let bitcoin_wallet = context.bitcoin_wallet.as_ref().unwrap();
let (txid, _) = cli::cancel(
self.params.swap_id.unwrap(),
Arc::clone(bitcoin_wallet),
Arc::clone(&context.db),
)
.await?;
tracing::debug!("Cancel transaction successfully published with id {}", txid);
let (txid, _) = cli::cancel_and_refund(swap_id, Arc::clone(bitcoin_wallet), Arc::clone(&context.db).await?;
json!({
"txid": txid,