Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-07-05 02:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #108

Browse Source 
108: Remove all CLI short-codes because they don't add value at the moment r=da-kami a=da-kami

`struct_opt` does not check at compile time, if there is a duplicate. Only when running the application. We have been running in this annoyance twice, so let's remove the shortcodes for now. 

Co-authored-by: Daniel Karzel <daniel@comit.network>
This commit is contained in:
bors[bot] 2020-12-22 07:11:01 +00:00 committed by GitHub
commit 672377b216
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
swap/src/cli.rs
View File

@ -5,7 +5,7 @@ use uuid::Uuid;
#[derive(structopt::StructOpt, Debug)] #[derive(structopt::StructOpt, Debug)]
pub struct Options { pub struct Options {
// TODO: Default value should points to proper configuration folder in home folder // TODO: Default value should points to proper configuration folder in home folder
#[structopt(short = "db", long = "database", default_value = "./.swap-db/")] #[structopt(long = "database", default_value = "./.swap-db/")]
pub db_path: String, pub db_path: String,
#[structopt(subcommand)] #[structopt(subcommand)]
@ -16,89 +16,67 @@ pub struct Options {
#[structopt(name = "xmr-btc-swap", about = "XMR BTC atomic swap")] #[structopt(name = "xmr-btc-swap", about = "XMR BTC atomic swap")]
pub enum Command { pub enum Command {
SellXmr { SellXmr {
#[structopt( #[structopt(long = "bitcoind-rpc", default_value = "http://127.0.0.1:8332")]
short = "b",
long = "bitcoind-rpc",
default_value = "http://127.0.0.1:8332"
)]
bitcoind_url: Url, bitcoind_url: Url,
#[structopt(short = "n", long = "bitcoin-wallet-name")] #[structopt(long = "bitcoin-wallet-name")]
bitcoin_wallet_name: String, bitcoin_wallet_name: String,
#[structopt( #[structopt(
short = "m",
long = "monero-wallet-rpc", long = "monero-wallet-rpc",
default_value = "http://127.0.0.1:18083/json_rpc" default_value = "http://127.0.0.1:18083/json_rpc"
)] )]
monero_wallet_rpc_url: Url, monero_wallet_rpc_url: Url,
#[structopt( #[structopt(long = "p2p-address", default_value = "/ip4/127.0.0.1/tcp/9876")]
short = "a",
long = "p2p-address",
default_value = "/ip4/127.0.0.1/tcp/9876"
)]
listen_addr: Multiaddr, listen_addr: Multiaddr,
#[structopt(short = "s", long = "send-xmr", help = "Monero amount as floating point nr without denomination (e.g. 125.1)", parse(try_from_str = parse_xmr))] #[structopt(long = "send-xmr", help = "Monero amount as floating point nr without denomination (e.g. 125.1)", parse(try_from_str = parse_xmr))]
send_monero: xmr_btc::monero::Amount, send_monero: xmr_btc::monero::Amount,
#[structopt(short = "r", long = "receive-btc", help = "Bitcoin amount as floating point nr without denomination (e.g. 1.25)", parse(try_from_str = parse_btc))] #[structopt(long = "receive-btc", help = "Bitcoin amount as floating point nr without denomination (e.g. 1.25)", parse(try_from_str = parse_btc))]
receive_bitcoin: bitcoin::Amount, receive_bitcoin: bitcoin::Amount,
}, },
BuyXmr { BuyXmr {
#[structopt(short = "p", long = "connect-peer-id")] #[structopt(long = "connect-peer-id")]
alice_peer_id: PeerId, alice_peer_id: PeerId,
#[structopt(short = "a", long = "connect-addr")] #[structopt(long = "connect-addr")]
alice_addr: Multiaddr, alice_addr: Multiaddr,
#[structopt( #[structopt(long = "bitcoind-rpc", default_value = "http://127.0.0.1:8332")]
short = "b",
long = "bitcoind-rpc",
default_value = "http://127.0.0.1:8332"
)]
bitcoind_url: Url, bitcoind_url: Url,
#[structopt(short = "n", long = "bitcoin-wallet-name")] #[structopt(long = "bitcoin-wallet-name")]
bitcoin_wallet_name: String, bitcoin_wallet_name: String,
#[structopt( #[structopt(long = "monerod", default_value = "http://127.0.0.1:18083/json_rpc")]
short = "m",
long = "monerod",
default_value = "http://127.0.0.1:18083/json_rpc"
)]
monero_wallet_rpc_url: Url, monero_wallet_rpc_url: Url,
#[structopt(short = "s", long = "send-btc", help = "Bitcoin amount as floating point nr without denomination (e.g. 1.25)", parse(try_from_str = parse_btc))] #[structopt(long = "send-btc", help = "Bitcoin amount as floating point nr without denomination (e.g. 1.25)", parse(try_from_str = parse_btc))]
send_bitcoin: bitcoin::Amount, send_bitcoin: bitcoin::Amount,
#[structopt(short = "r", long = "receive-xmr", help = "Monero amount as floating point nr without denomination (e.g. 125.1)", parse(try_from_str = parse_xmr))] #[structopt(long = "receive-xmr", help = "Monero amount as floating point nr without denomination (e.g. 125.1)", parse(try_from_str = parse_xmr))]
receive_monero: xmr_btc::monero::Amount, receive_monero: xmr_btc::monero::Amount,
}, },
History, History,
Resume { Resume {
#[structopt(short = "id", long = "swap-id")] #[structopt(long = "swap-id")]
swap_id: Uuid, swap_id: Uuid,
#[structopt(short = "p", long = "connect-peer-id")] #[structopt(long = "connect-peer-id")]
alice_peer_id: PeerId, alice_peer_id: PeerId,
#[structopt(short = "a", long = "connect-addr")] #[structopt(long = "connect-addr")]
alice_addr: Multiaddr, alice_addr: Multiaddr,
#[structopt( #[structopt(long = "bitcoind-rpc", default_value = "http://127.0.0.1:8332")]
short = "b",
long = "bitcoind-rpc",
default_value = "http://127.0.0.1:8332"
)]
bitcoind_url: Url, bitcoind_url: Url,
#[structopt(short = "n", long = "bitcoin-wallet-name")] #[structopt(long = "bitcoin-wallet-name")]
bitcoin_wallet_name: String, bitcoin_wallet_name: String,
#[structopt( #[structopt(
short = "m",
long = "monero-wallet-rpc", long = "monero-wallet-rpc",
default_value = "http://127.0.0.1:18083/json_rpc" default_value = "http://127.0.0.1:18083/json_rpc"
)] )]
@ -106,11 +84,7 @@ pub enum Command {
// TODO: The listen address is only relevant for Alice, but should be role independent // TODO: The listen address is only relevant for Alice, but should be role independent
// see: https://github.com/comit-network/xmr-btc-swap/issues/77 // see: https://github.com/comit-network/xmr-btc-swap/issues/77
#[structopt( #[structopt(long = "p2p-address", default_value = "/ip4/127.0.0.1/tcp/9876")]
short = "a",
long = "p2p-address",
default_value = "/ip4/127.0.0.1/tcp/9876"
)]
listen_addr: Multiaddr, listen_addr: Multiaddr,
}, },
} }