Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-08 06:22:39 -04: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

50
swap/src/cli/command.rs
View file

@ -227,7 +227,7 @@ where
.await?;
(context, request)
}
CliCommand::Cancel {
CliCommand::CancelAndRefund {
swap_id: SwapId { swap_id },
bitcoin,
tor,
@ -237,35 +237,7 @@ where
swap_id: Some(swap_id),
..Default::default()
},
cmd: Method::Cancel,
shutdown: Shutdown::new(rx.subscribe()),
};
let context = Context::build(
Some(bitcoin),
None,
Some(tor),
data,
is_testnet,
debug,
json,
None,
rx,
)
.await?;
(context, request)
}
CliCommand::Refund {
swap_id: SwapId { swap_id },
bitcoin,
tor,
} => {
let request = Request {
params: Params {
swap_id: Some(swap_id),
..Default::default()
},
cmd: Method::Refund,
cmd: Method::CancelAndRefund,
shutdown: Shutdown::new(rx.subscribe()),
};
@ -465,21 +437,9 @@ enum CliCommand {
#[structopt(flatten)]
tor: Tor,
},
/// Force submission of the cancel transaction overriding the protocol state
/// machine and blockheight checks (expert users only)
Cancel {
#[structopt(flatten)]
swap_id: SwapId,
#[structopt(flatten)]
bitcoin: Bitcoin,
#[structopt(flatten)]
tor: Tor,
},
/// Force submission of the refund transaction overriding the protocol state
/// machine and blockheight checks (expert users only)
Refund {
/// Force the submission of the cancel and refund transactions of a swap
#[structopt(aliases = &["cancel", "refund"])]
CancelAndRefund {
#[structopt(flatten)]
swap_id: SwapId,