Remove unnecessary wrapper struct

This commit is contained in:
rishflab 2021-04-06 11:05:36 +10:00
parent d144405182
commit 7df93faa4b
2 changed files with 17 additions and 25 deletions

View file

@ -44,8 +44,12 @@ pub enum Command {
)]
alice_peer_id: PeerId,
#[structopt(flatten)]
alice_multi_addr: AliceMultiaddress,
#[structopt(
long = "seller-addr",
default_value = DEFAULT_ALICE_MULTIADDR,
help = "The multiaddr of a specific swap partner can be optionally provided"
)]
alice_multiaddr: Multiaddr,
#[structopt(long = "electrum-rpc",
help = "Provide the Bitcoin Electrum RPC URL",
@ -66,8 +70,12 @@ pub enum Command {
)]
swap_id: Uuid,
#[structopt(flatten)]
alice_multi_addr: AliceMultiaddress,
#[structopt(
long = "seller-addr",
default_value = DEFAULT_ALICE_MULTIADDR,
help = "The multiaddr of a specific swap partner can be optionally provided"
)]
alice_multiaddr: Multiaddr,
#[structopt(long = "electrum-rpc",
help = "Provide the Bitcoin Electrum RPC URL",
@ -114,16 +122,6 @@ pub enum Command {
},
}
#[derive(structopt::StructOpt, Debug)]
pub struct AliceMultiaddress {
#[structopt(
long = "seller-addr",
default_value = DEFAULT_ALICE_MULTIADDR,
help = "The multiaddr of a specific swap partner can be optionally provided"
)]
pub multiaddr: Multiaddr,
}
#[derive(structopt::StructOpt, Debug)]
pub struct MoneroParams {
#[structopt(long = "receive-address",