Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-04-26 10:49:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge patterns of nested match

Browse Source
This commit is contained in:
Thomas Eizinger 2021-06-21 11:22:45 +10:00
parent e50de7dc99
commit 707bae9ff0
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
1 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,11 +55,10 @@ where
env_config: env_config(is_testnet), env_config: env_config(is_testnet),
cmd: Command::Balance, cmd: Command::Balance,
}, },
RawCommand::ManualRecovery(manual_recovery) => match manual_recovery { RawCommand::ManualRecovery(ManualRecovery::Redeem {
ManualRecovery::Redeem {
redeem_params: RecoverCommandParams { swap_id, force }, redeem_params: RecoverCommandParams { swap_id, force },
do_not_await_finality, do_not_await_finality,
} => Arguments { }) => Arguments {
testnet: is_testnet, testnet: is_testnet,
json: is_json, json: is_json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, is_testnet)?,
@ -70,41 +69,40 @@ where
do_not_await_finality, do_not_await_finality,
}, },
}, },
ManualRecovery::Cancel { RawCommand::ManualRecovery(ManualRecovery::Cancel {
cancel_params: RecoverCommandParams { swap_id, force }, cancel_params: RecoverCommandParams { swap_id, force },
} => Arguments { }) => Arguments {
testnet: is_testnet, testnet: is_testnet,
json: is_json, json: is_json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, is_testnet)?,
env_config: env_config(is_testnet), env_config: env_config(is_testnet),
cmd: Command::Cancel { swap_id, force }, cmd: Command::Cancel { swap_id, force },
}, },
ManualRecovery::Refund { RawCommand::ManualRecovery(ManualRecovery::Refund {
refund_params: RecoverCommandParams { swap_id, force }, refund_params: RecoverCommandParams { swap_id, force },
} => Arguments { }) => Arguments {
testnet: is_testnet, testnet: is_testnet,
json: is_json, json: is_json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, is_testnet)?,
env_config: env_config(is_testnet), env_config: env_config(is_testnet),
cmd: Command::Refund { swap_id, force }, cmd: Command::Refund { swap_id, force },
}, },
ManualRecovery::Punish { RawCommand::ManualRecovery(ManualRecovery::Punish {
punish_params: RecoverCommandParams { swap_id, force }, punish_params: RecoverCommandParams { swap_id, force },
} => Arguments { }) => Arguments {
testnet: is_testnet, testnet: is_testnet,
json: is_json, json: is_json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, is_testnet)?,
env_config: env_config(is_testnet), env_config: env_config(is_testnet),
cmd: Command::Punish { swap_id, force }, cmd: Command::Punish { swap_id, force },
}, },
ManualRecovery::SafelyAbort { swap_id } => Arguments { RawCommand::ManualRecovery(ManualRecovery::SafelyAbort { swap_id }) => Arguments {
testnet: is_testnet, testnet: is_testnet,
json: is_json, json: is_json,
config_path: config_path(config, is_testnet)?, config_path: config_path(config, is_testnet)?,
env_config: env_config(is_testnet), env_config: env_config(is_testnet),
cmd: Command::SafelyAbort { swap_id }, cmd: Command::SafelyAbort { swap_id },
}, },
},
}; };
Ok(arguments) Ok(arguments)