Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-06-30 16:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplication and cleanup

Browse Source 
In the past we had problems with flags/parameter changes several times, where on instance was changed, buy another one was missed. This should mitigate this problem.
This patch introduces structs for all duplicated parameters and uses flatten to only have one point for changes.

Additionally removes all mentions of `alice` from the commands / variables. This code is on an application level and should not be concerned with swap protocol roles.
This commit is contained in:
Daniel Karzel 2021-05-11 12:00:11 +10:00
parent 4e1f3f82bd
commit 343badbb4b
No known key found for this signature in database
GPG Key ID: 30C3FC2E438ADB6E
2 changed files with 53 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ use std::sync::Arc;
use std::time::Duration;
use structopt::StructOpt;
use swap::bitcoin::TxLock;
use swap::cli::command::{Arguments, Bitcoin, Command, Monero};
use swap::cli::command::{Arguments, Bitcoin, Command, Monero, SellerAddr, SwapId, Tor};
use swap::database::Database;
use swap::env::{Config, GetConfig};
use swap::network::quote::BidQuote;
@ -43,8 +43,8 @@ async fn main() -> Result<()> {
match cmd {
Command::BuyXmr {
alice_peer_id,
alice_multiaddr,
seller_peer_id,
seller_addr: SellerAddr { seller_addr },
bitcoin:
Bitcoin {
electrum_rpc_url,
@ -55,7 +55,7 @@ async fn main() -> Result<()> {
receive_monero_address,
monero_daemon_host,
},
tor_socks5_port,
tor: Tor { tor_socks5_port },
} => {
let swap_id = Uuid::new_v4();
@ -87,14 +87,14 @@ async fn main() -> Result<()> {
init_monero_wallet(data_dir, monero_daemon_host, env_config).await?;
let bitcoin_wallet = Arc::new(bitcoin_wallet);
let mut swarm = swarm::bob(&seed, alice_peer_id, tor_socks5_port).await?;
let mut swarm = swarm::bob(&seed, seller_peer_id, tor_socks5_port).await?;
swarm
.behaviour_mut()
.add_address(alice_peer_id, alice_multiaddr);
.add_address(seller_peer_id, seller_addr);
let swap_id = Uuid::new_v4();
let (event_loop, mut event_loop_handle) =
EventLoop::new(swap_id, swarm, alice_peer_id, bitcoin_wallet.clone())?;
EventLoop::new(swap_id, swarm, seller_peer_id, bitcoin_wallet.clone())?;
let event_loop = tokio::spawn(event_loop.run());
let max_givable = || bitcoin_wallet.max_giveable(TxLock::script_size());
@ -109,7 +109,7 @@ async fn main() -> Result<()> {
info!("Swapping {} with {} fees", send_bitcoin, fees);
db.insert_peer_id(swap_id, alice_peer_id).await?;
db.insert_peer_id(swap_id, seller_peer_id).await?;
let swap = Swap::new(
db,
@ -150,8 +150,8 @@ async fn main() -> Result<()> {
table.printstd();
}
Command::Resume {
swap_id,
alice_multiaddr,
swap_id: SwapId { swap_id },
seller_addr: SellerAddr { seller_addr },
bitcoin:
Bitcoin {
electrum_rpc_url,
@ -162,7 +162,7 @@ async fn main() -> Result<()> {
receive_monero_address,
monero_daemon_host,
},
tor_socks5_port,
tor: Tor { tor_socks5_port },
} => {
let data_dir = data.0;
cli::tracing::init(debug, data_dir.join("logs"), swap_id)?;
@ -188,17 +188,17 @@ async fn main() -> Result<()> {
init_monero_wallet(data_dir, monero_daemon_host, env_config).await?;
let bitcoin_wallet = Arc::new(bitcoin_wallet);
let alice_peer_id = db.get_peer_id(swap_id)?;
let seller_peer_id = db.get_peer_id(swap_id)?;
let mut swarm = swarm::bob(&seed, alice_peer_id, tor_socks5_port).await?;
let mut swarm = swarm::bob(&seed, seller_peer_id, tor_socks5_port).await?;
let bob_peer_id = swarm.local_peer_id();
tracing::debug!("Our peer-id: {}", bob_peer_id);
swarm
.behaviour_mut()
.add_address(alice_peer_id, alice_multiaddr);
.add_address(seller_peer_id, seller_addr);
let (event_loop, event_loop_handle) =
EventLoop::new(swap_id, swarm, alice_peer_id, bitcoin_wallet.clone())?;
EventLoop::new(swap_id, swarm, seller_peer_id, bitcoin_wallet.clone())?;
let handle = tokio::spawn(event_loop.run());
let swap = Swap::from_db(
@ -221,7 +221,7 @@ async fn main() -> Result<()> {
}
}
Command::Cancel {
swap_id,
swap_id: SwapId { swap_id },
force,
bitcoin:
Bitcoin {
@ -258,7 +258,7 @@ async fn main() -> Result<()> {
}
}
Command::Refund {
swap_id,
swap_id: SwapId { swap_id },
force,
bitcoin:
Bitcoin {

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

@ -37,10 +37,10 @@ pub enum Command {
/// Start a XMR for BTC swap
BuyXmr {
#[structopt(long = "seller-peer-id", help = "The seller's peer id")]
alice_peer_id: PeerId,
seller_peer_id: PeerId,
#[structopt(long = "seller-addr", help = "The seller's multiaddress")]
alice_multiaddr: Multiaddr,
#[structopt(flatten)]
seller_addr: SellerAddr,
#[structopt(flatten)]
bitcoin: Bitcoin,
@ -48,21 +48,18 @@ pub enum Command {
#[structopt(flatten)]
monero: Monero,
#[structopt(long = "tor-socks5-port", help = "Your local Tor socks5 proxy port", default_value = DEFAULT_TOR_SOCKS5_PORT)]
tor_socks5_port: u16,
#[structopt(flatten)]
tor: Tor,
},
/// Show a list of past ongoing and completed swaps
History,
/// Resume a swap
Resume {
#[structopt(
long = "swap-id",
help = "The swap id can be retrieved using the history subcommand"
)]
swap_id: Uuid,
#[structopt(flatten)]
swap_id: SwapId,
#[structopt(long = "seller-addr", help = "The seller's multiaddress")]
alice_multiaddr: Multiaddr,
#[structopt(flatten)]
seller_addr: SellerAddr,
#[structopt(flatten)]
bitcoin: Bitcoin,
@ -70,16 +67,13 @@ pub enum Command {
#[structopt(flatten)]
monero: Monero,
#[structopt(long = "tor-socks5-port", help = "Your local Tor socks5 proxy port", default_value = DEFAULT_TOR_SOCKS5_PORT)]
tor_socks5_port: u16,
#[structopt(flatten)]
tor: Tor,
},
/// Try to cancel an ongoing swap (expert users only)
Cancel {
#[structopt(
long = "swap-id",
help = "The swap id can be retrieved using the history subcommand"
)]
swap_id: Uuid,
#[structopt(flatten)]
swap_id: SwapId,
#[structopt(short, long)]
force: bool,
@ -89,11 +83,8 @@ pub enum Command {
},
/// Try to cancel a swap and refund my BTC (expert users only)
Refund {
#[structopt(
long = "swap-id",
help = "The swap id can be retrieved using the history subcommand"
)]
swap_id: Uuid,
#[structopt(flatten)]
swap_id: SwapId,
#[structopt(short, long)]
force: bool,
@ -131,6 +122,27 @@ pub struct Bitcoin {
pub bitcoin_target_block: usize,
}
#[derive(structopt::StructOpt, Debug)]
pub struct Tor {
#[structopt(long = "tor-socks5-port", help = "Your local Tor socks5 proxy port", default_value = DEFAULT_TOR_SOCKS5_PORT)]
pub tor_socks5_port: u16,
}
#[derive(structopt::StructOpt, Debug)]
pub struct SwapId {
#[structopt(
long = "swap-id",
help = "The swap id can be retrieved using the history subcommand"
)]
pub swap_id: Uuid,
}
#[derive(structopt::StructOpt, Debug)]
pub struct SellerAddr {
#[structopt(long = "seller-addr", help = "The seller's multiaddress")]
pub seller_addr: Multiaddr,
}
#[derive(Clone, Debug)]
pub struct Data(pub PathBuf);