Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-02-22 23:59:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove param from names

Browse Source 
Did not add any value, more readable with just bitcoin and monero.
This commit is contained in:
Daniel Karzel 2021-05-11 11:44:21 +10:00
parent 657ac1e2e4
commit 4e1f3f82bd
No known key found for this signature in database
GPG Key ID: 30C3FC2E438ADB6E
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
swap/src/bin/swap.rs
View File

@ -21,7 +21,7 @@ use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use structopt::StructOpt; use structopt::StructOpt;
use swap::bitcoin::TxLock; use swap::bitcoin::TxLock;
use swap::cli::command::{Arguments, BitcoinParams, Command, MoneroParams}; use swap::cli::command::{Arguments, Bitcoin, Command, Monero};
use swap::database::Database; use swap::database::Database;
use swap::env::{Config, GetConfig}; use swap::env::{Config, GetConfig};
use swap::network::quote::BidQuote; use swap::network::quote::BidQuote;
@ -45,13 +45,13 @@ async fn main() -> Result<()> {
Command::BuyXmr { Command::BuyXmr {
alice_peer_id, alice_peer_id,
alice_multiaddr, alice_multiaddr,
bitcoin_params: bitcoin:
BitcoinParams { Bitcoin {
electrum_rpc_url, electrum_rpc_url,
bitcoin_target_block, bitcoin_target_block,
}, },
monero_params: monero:
MoneroParams { Monero {
receive_monero_address, receive_monero_address,
monero_daemon_host, monero_daemon_host,
}, },
@ -152,13 +152,13 @@ async fn main() -> Result<()> {
Command::Resume { Command::Resume {
swap_id, swap_id,
alice_multiaddr, alice_multiaddr,
bitcoin_params: bitcoin:
BitcoinParams { Bitcoin {
electrum_rpc_url, electrum_rpc_url,
bitcoin_target_block, bitcoin_target_block,
}, },
monero_params: monero:
MoneroParams { Monero {
receive_monero_address, receive_monero_address,
monero_daemon_host, monero_daemon_host,
}, },
@ -223,8 +223,8 @@ async fn main() -> Result<()> {
Command::Cancel { Command::Cancel {
swap_id, swap_id,
force, force,
bitcoin_params: bitcoin:
BitcoinParams { Bitcoin {
electrum_rpc_url, electrum_rpc_url,
bitcoin_target_block, bitcoin_target_block,
}, },
@ -260,8 +260,8 @@ async fn main() -> Result<()> {
Command::Refund { Command::Refund {
swap_id, swap_id,
force, force,
bitcoin_params: bitcoin:
BitcoinParams { Bitcoin {
electrum_rpc_url, electrum_rpc_url,
bitcoin_target_block, bitcoin_target_block,
}, },

16
swap/src/cli/command.rs
View File

@ -43,10 +43,10 @@ pub enum Command {
alice_multiaddr: Multiaddr, alice_multiaddr: Multiaddr,
#[structopt(flatten)] #[structopt(flatten)]
bitcoin_params: BitcoinParams, bitcoin: Bitcoin,
#[structopt(flatten)] #[structopt(flatten)]
monero_params: MoneroParams, monero: Monero,
#[structopt(long = "tor-socks5-port", help = "Your local Tor socks5 proxy port", default_value = DEFAULT_TOR_SOCKS5_PORT)] #[structopt(long = "tor-socks5-port", help = "Your local Tor socks5 proxy port", default_value = DEFAULT_TOR_SOCKS5_PORT)]
tor_socks5_port: u16, tor_socks5_port: u16,
@ -65,10 +65,10 @@ pub enum Command {
alice_multiaddr: Multiaddr, alice_multiaddr: Multiaddr,
#[structopt(flatten)] #[structopt(flatten)]
bitcoin_params: BitcoinParams, bitcoin: Bitcoin,
#[structopt(flatten)] #[structopt(flatten)]
monero_params: MoneroParams, monero: Monero,
#[structopt(long = "tor-socks5-port", help = "Your local Tor socks5 proxy port", default_value = DEFAULT_TOR_SOCKS5_PORT)] #[structopt(long = "tor-socks5-port", help = "Your local Tor socks5 proxy port", default_value = DEFAULT_TOR_SOCKS5_PORT)]
tor_socks5_port: u16, tor_socks5_port: u16,
@ -85,7 +85,7 @@ pub enum Command {
force: bool, force: bool,
#[structopt(flatten)] #[structopt(flatten)]
bitcoin_params: BitcoinParams, bitcoin: Bitcoin,
}, },
/// Try to cancel a swap and refund my BTC (expert users only) /// Try to cancel a swap and refund my BTC (expert users only)
Refund { Refund {
@ -99,12 +99,12 @@ pub enum Command {
force: bool, force: bool,
#[structopt(flatten)] #[structopt(flatten)]
bitcoin_params: BitcoinParams, bitcoin: Bitcoin,
}, },
} }
#[derive(structopt::StructOpt, Debug)] #[derive(structopt::StructOpt, Debug)]
pub struct MoneroParams { pub struct Monero {
#[structopt(long = "receive-address", #[structopt(long = "receive-address",
help = "Provide the monero address where you would like to receive monero", help = "Provide the monero address where you would like to receive monero",
parse(try_from_str = parse_monero_address) parse(try_from_str = parse_monero_address)
@ -120,7 +120,7 @@ pub struct MoneroParams {
} }
#[derive(structopt::StructOpt, Debug)] #[derive(structopt::StructOpt, Debug)]
pub struct BitcoinParams { pub struct Bitcoin {
#[structopt(long = "electrum-rpc", #[structopt(long = "electrum-rpc",
help = "Provide the Bitcoin Electrum RPC URL", help = "Provide the Bitcoin Electrum RPC URL",
default_value = DEFAULT_ELECTRUM_RPC_URL default_value = DEFAULT_ELECTRUM_RPC_URL