mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-08-09 23:12:40 -04:00
Fix rebase conflicts
This commit is contained in:
parent
620216a596
commit
379aff50cf
5 changed files with 37 additions and 16 deletions
|
@ -18,7 +18,10 @@ pub enum Options {
|
|||
#[structopt(default_value = "http://127.0.0.1:8332", long = "bitcoind")]
|
||||
bitcoind_url: Url,
|
||||
|
||||
#[structopt(default_value = "http://127.0.0.1:18083/json_rpc", long = "monero_wallet_rpc")]
|
||||
#[structopt(
|
||||
default_value = "http://127.0.0.1:18083/json_rpc",
|
||||
long = "monero_wallet_rpc"
|
||||
)]
|
||||
monero_wallet_rpc_url: Url,
|
||||
|
||||
#[structopt(
|
||||
|
@ -43,7 +46,10 @@ pub enum Options {
|
|||
#[structopt(default_value = "http://127.0.0.1:8332", long = "bitcoind")]
|
||||
bitcoind_url: Url,
|
||||
|
||||
#[structopt(default_value = "http://127.0.0.1:18083/json_rpc", long = "monero_wallet_rpc")]
|
||||
#[structopt(
|
||||
default_value = "http://127.0.0.1:18083/json_rpc",
|
||||
long = "monero_wallet_rpc"
|
||||
)]
|
||||
monero_wallet_rpc_url: Url,
|
||||
|
||||
#[structopt(
|
||||
|
@ -63,7 +69,16 @@ pub enum Options {
|
|||
#[structopt(default_value = "http://127.0.0.1:8332", long = "bitcoind")]
|
||||
bitcoind_url: Url,
|
||||
|
||||
#[structopt(default_value = "http://127.0.0.1:18083/json_rpc", long = "monerod")]
|
||||
monerod_url: Url,
|
||||
#[structopt(
|
||||
default_value = "http://127.0.0.1:18083/json_rpc",
|
||||
long = "monero_wallet_rpc"
|
||||
)]
|
||||
monero_wallet_rpc_url: Url,
|
||||
|
||||
#[structopt(
|
||||
default_value = "http://127.0.0.1:18084",
|
||||
long = "monero_watch_only_wallet_rpc"
|
||||
)]
|
||||
monero_watch_only_wallet_rpc_url: Url,
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue