Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-08 14:32:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make config argument global

Browse source 
The `config` argument apply to all commands. It is now optional and
needs to be passed before a command.
E.g. `cli --config ./config.toml history`
This commit is contained in:
Franck Royer 2021-02-11 15:21:34 +11:00
parent 83dcf4ba3c
commit 8fada42074
No known key found for this signature in database
GPG key ID: A82ED75A8DFC50A4
5 changed files with 73 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,11 +6,11 @@ use uuid::Uuid;
#[derive(structopt::StructOpt, Debug)]
pub struct Arguments {
#[structopt(
long = "data-dir",
help = "Provide a custom path to the data directory.",
long = "config",
help = "Provide a custom path to the configuration file. The configuration file must be a toml file.",
parse(from_os_str)
)]
pub data_dir: Option<PathBuf>,
pub config: Option<PathBuf>,
#[structopt(subcommand)]
pub cmd: Command,
@ -31,9 +31,6 @@ pub enum Command {
#[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: monero::Amount,
#[structopt(flatten)]
config: Config,
},
History,
Resume(Resume),
@ -52,9 +49,6 @@ pub enum Resume {
#[structopt(long = "counterpart-addr")]
alice_addr: Multiaddr,
#[structopt(flatten)]
config: Config,
},
}
@ -71,9 +65,6 @@ pub enum Cancel {
#[structopt(long = "counterpart-addr")]
alice_addr: Multiaddr,
#[structopt(flatten)]
config: Config,
#[structopt(short, long)]
force: bool,
},
@ -92,24 +83,11 @@ pub enum Refund {
#[structopt(long = "counterpart-addr")]
alice_addr: Multiaddr,
#[structopt(flatten)]
config: Config,
#[structopt(short, long)]
force: bool,
},
}
#[derive(structopt::StructOpt, Debug)]
pub struct Config {
#[structopt(
long = "config",
help = "Provide a custom path to the configuration file. The configuration file must be a toml file.",
parse(from_os_str)
)]
pub path: Option<PathBuf>,
}
fn parse_btc(str: &str) -> anyhow::Result<bitcoin::Amount> {
let amount = bitcoin::Amount::from_str_in(str, ::bitcoin::Denomination::Bitcoin)?;
Ok(amount)