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

Rename variables to match struct fields

Browse Source
This commit is contained in:
rishflab 2021-09-09 21:14:57 +10:00
parent 1a2b42ccd1
commit 19836a1051
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
swap/src/asb/command.rs
View File

@ -18,51 +18,51 @@ where
let matches = RawArguments::clap().get_matches_from_safe(raw_args)?; let matches = RawArguments::clap().get_matches_from_safe(raw_args)?;
let args = RawArguments::from_clap(&matches); let args = RawArguments::from_clap(&matches);
let is_json = args.json; let json = args.json;
let is_testnet = args.testnet; let testnet = args.testnet;
let config = args.config; let config = args.config;
let command: RawCommand = args.cmd; let command: RawCommand = args.cmd;
let arguments = match command { let arguments = match command {
RawCommand::Start { resume_only } => Arguments { RawCommand::Start { resume_only } => Arguments {
testnet: is_testnet, testnet,
json: is_json, json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, testnet)?,
env_config: env_config(is_testnet), env_config: env_config(testnet),
cmd: Command::Start { resume_only }, cmd: Command::Start { resume_only },
}, },
RawCommand::History => Arguments { RawCommand::History => Arguments {
testnet: is_testnet, testnet,
json: is_json, json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, testnet)?,
env_config: env_config(is_testnet), env_config: env_config(testnet),
cmd: Command::History, cmd: Command::History,
}, },
RawCommand::WithdrawBtc { amount, address } => Arguments { RawCommand::WithdrawBtc { amount, address } => Arguments {
testnet: is_testnet, testnet,
json: is_json, json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, testnet)?,
env_config: env_config(is_testnet), env_config: env_config(testnet),
cmd: Command::WithdrawBtc { cmd: Command::WithdrawBtc {
amount, amount,
address: bitcoin_address(address, is_testnet)?, address: bitcoin_address(address, testnet)?,
}, },
}, },
RawCommand::Balance => Arguments { RawCommand::Balance => Arguments {
testnet: is_testnet, testnet,
json: is_json, json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, testnet)?,
env_config: env_config(is_testnet), env_config: env_config(testnet),
cmd: Command::Balance, cmd: Command::Balance,
}, },
RawCommand::ManualRecovery(ManualRecovery::Redeem { RawCommand::ManualRecovery(ManualRecovery::Redeem {
redeem_params: RecoverCommandParams { swap_id }, redeem_params: RecoverCommandParams { swap_id },
do_not_await_finality, do_not_await_finality,
}) => Arguments { }) => Arguments {
testnet: is_testnet, testnet,
json: is_json, json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, testnet)?,
env_config: env_config(is_testnet), env_config: env_config(testnet),
cmd: Command::Redeem { cmd: Command::Redeem {
swap_id, swap_id,
@ -72,35 +72,35 @@ where
RawCommand::ManualRecovery(ManualRecovery::Cancel { RawCommand::ManualRecovery(ManualRecovery::Cancel {
cancel_params: RecoverCommandParams { swap_id }, cancel_params: RecoverCommandParams { swap_id },
}) => Arguments { }) => Arguments {
testnet: is_testnet, testnet,
json: is_json, json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, testnet)?,
env_config: env_config(is_testnet), env_config: env_config(testnet),
cmd: Command::Cancel { swap_id }, cmd: Command::Cancel { swap_id },
}, },
RawCommand::ManualRecovery(ManualRecovery::Refund { RawCommand::ManualRecovery(ManualRecovery::Refund {
refund_params: RecoverCommandParams { swap_id }, refund_params: RecoverCommandParams { swap_id },
}) => Arguments { }) => Arguments {
testnet: is_testnet, testnet,
json: is_json, json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, testnet)?,
env_config: env_config(is_testnet), env_config: env_config(testnet),
cmd: Command::Refund { swap_id }, cmd: Command::Refund { swap_id },
}, },
RawCommand::ManualRecovery(ManualRecovery::Punish { RawCommand::ManualRecovery(ManualRecovery::Punish {
punish_params: RecoverCommandParams { swap_id }, punish_params: RecoverCommandParams { swap_id },
}) => Arguments { }) => Arguments {
testnet: is_testnet, testnet,
json: is_json, json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, testnet)?,
env_config: env_config(is_testnet), env_config: env_config(testnet),
cmd: Command::Punish { swap_id }, cmd: Command::Punish { swap_id },
}, },
RawCommand::ManualRecovery(ManualRecovery::SafelyAbort { swap_id }) => Arguments { RawCommand::ManualRecovery(ManualRecovery::SafelyAbort { swap_id }) => Arguments {
testnet: is_testnet, testnet,
json: is_json, json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, testnet)?,
env_config: env_config(is_testnet), env_config: env_config(testnet),
cmd: Command::SafelyAbort { swap_id }, cmd: Command::SafelyAbort { swap_id },
}, },
}; };