From c0a2957c378d911096792e70b7671a98cf969c6e Mon Sep 17 00:00:00 2001 From: Einliterflasche Date: Wed, 10 Jul 2024 12:14:42 +0200 Subject: [PATCH] Remove flag and make behaviour implicit --- swap/src/cli/command.rs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/swap/src/cli/command.rs b/swap/src/cli/command.rs index dba1b604..7a62d08c 100644 --- a/swap/src/cli/command.rs +++ b/swap/src/cli/command.rs @@ -65,7 +65,6 @@ where seller: Seller { seller }, bitcoin, bitcoin_change_address, - refund_to_internal_wallet: _, monero, monero_receive_address, tor, @@ -93,7 +92,7 @@ where tracing::info!( internal_wallet=%internal_wallet, - "Found flag --refund-to-internal-wallet. Incase of a refund the bitcoin will be send to this internal wallet." + "No --change-address supplied. Incase of a refund funds will be sent to internal wallet." ); internal_wallet @@ -320,21 +319,11 @@ enum CliCommand { #[structopt( long = "change-address", - help = "The bitcoin address where any form of change or excess funds should be sent to", - required_unless = "refund-to-internal-wallet", + help = "The bitcoin address where any form of change or excess funds should be sent to. If omitted they will be sent to the internal wallet.", parse(try_from_str = bitcoin_address::parse) )] bitcoin_change_address: Option, - #[structopt( - conflicts_with = "bitcoin-change-address", - required_unless = "bitcoin-change-address", - long = "refund-to-internal-wallet", - help = "Instead of providing a bitcoin address to deposit refunded Bitcoin to, \ - this option will deposit them in the internal wallet for use in future swaps." - )] - refund_to_internal_wallet: bool, - #[structopt(flatten)] monero: Monero,