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

Context for monero address parsing errors

Browse Source 
Most of the errors are not user friendly, thus added context to tell the user the given address is incorrect.
This commit is contained in:
Daniel Karzel 2021-03-04 10:46:54 +11:00
parent 35d0e246d8
commit 7504c6ceee
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
use anyhow::{Context, Result};
use libp2p::{core::Multiaddr, PeerId};
use std::path::PathBuf;
use std::{path::PathBuf, str::FromStr};
use uuid::Uuid;
pub const DEFAULT_ALICE_MULTIADDR: &str = "/dns4/xmr-btc-asb.coblox.tech/tcp/9876";
@ -25,7 +26,7 @@ pub struct Arguments {
#[structopt(name = "xmr_btc-swap", about = "XMR BTC atomic swap")]
pub enum Command {
BuyXmr {
#[structopt(long = "receive-address")]
#[structopt(long = "receive-address", parse(try_from_str = parse_monero_address))]
receive_monero_address: monero::Address,
#[structopt(long = "connect-peer-id", default_value = DEFAULT_ALICE_PEER_ID)]
@ -39,7 +40,7 @@ pub enum Command {
},
History,
Resume {
#[structopt(long = "receive-address")]
#[structopt(long = "receive-address", parse(try_from_str = parse_monero_address))]
receive_monero_address: monero::Address,
#[structopt(long = "swap-id")]
@ -72,6 +73,15 @@ pub enum Command {
},
}
fn parse_monero_address(s: &str) -> Result<monero::Address> {
monero::Address::from_str(s).with_context(|| {
format!(
"Failed to parse {} as a monero address, please make sure it is a valid address",
s
)
})
}
#[cfg(test)]
mod tests {
use crate::cli::command::{DEFAULT_ALICE_MULTIADDR, DEFAULT_ALICE_PEER_ID};