reya/n34
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(cli): Improve run_command macro

Browse Source 
Signed-off-by: Awiteb <a@4rs.nl>
This commit is contained in:
Awiteb
2025-06-11 16:54:33 +00:00
parent 3e6fed8bc6
commit 63f6c1fb11
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/cli/macros.rs
View File

@@ -33,22 +33,21 @@ pub fn get_signer_state<T: CommandRunner>(_v: &T) -> bool {
/// last. /// last.
#[macro_export] #[macro_export]
macro_rules! run_command { macro_rules! run_command {
(r $command:ident $options:ident) => {{
if $crate::cli::macros::get_relays_state(&$command) {
$options.ensure_relays()?;
}
if $crate::cli::macros::get_signer_state(&$command) {
$options.ensure_signer()?;
}
$command.run($options).await
}};
($command:ident, $options:ident, $($subcommands:ident)* & $($commands:ident)*) => { ($command:ident, $options:ident, $($subcommands:ident)* & $($commands:ident)*) => {
match $command { match $command {
$( $(
Self::$subcommands { subcommands } => subcommands.run($options).await, Self::$subcommands { subcommands } => subcommands.run($options).await,
)* )*
$( $(
Self::$commands ( args ) => $crate::run_command!(r args $options), Self::$commands ( args ) => {
if $crate::cli::macros::get_relays_state(&args) {
$options.ensure_relays()?;
}
if $crate::cli::macros::get_signer_state(&args) {
$options.ensure_signer()?;
}
args.run($options).await
},
)* )*
} }
}; };