refactor: Move sub-command definition to corresponding module (#209)

txpipe · Mar 18, 2022 · c8d888b · c8d888b
1 parent 064c7e6
commit c8d888b
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 61 deletions.
diff --git a/src/bin/oura/daemon.rs b/src/bin/oura/daemon.rs
@@ -253,3 +253,13 @@ pub fn run(args: &ArgMatches) -> Result<(), Error> {
 
     Ok(())
 }
+
+/// Creates the clap definition for this sub-command
+pub(crate) fn command_definition<'a>() -> clap::Command<'a> {
+    clap::Command::new("daemon").arg(
+        clap::Arg::new("config")
+            .long("config")
+            .takes_value(true)
+            .help("config file to load by the daemon"),
+    )
+}
diff --git a/src/bin/oura/dump.rs b/src/bin/oura/dump.rs
@@ -158,3 +158,34 @@ pub fn run(args: &ArgMatches) -> Result<(), Error> {
 
     Ok(())
 }
+
+/// Creates the clap definition for this sub-command
+pub(crate) fn command_definition<'a>() -> clap::Command<'a> {
+    clap::Command::new("dump")
+        .arg(clap::Arg::new("socket").required(true))
+        .arg(
+            clap::Arg::new("bearer")
+                .long("bearer")
+                .takes_value(true)
+                .possible_values(&["tcp", "unix"]),
+        )
+        .arg(clap::Arg::new("magic").long("magic").takes_value(true))
+        .arg(
+            clap::Arg::new("since")
+                .long("since")
+                .takes_value(true)
+                .help("point in the chain to start reading from, expects format `slot,hex-hash`"),
+        )
+        .arg(
+            clap::Arg::new("mode")
+                .long("mode")
+                .takes_value(true)
+                .possible_values(&["node", "client"]),
+        )
+        .arg(
+            clap::Arg::new("output")
+                .long("output")
+                .takes_value(true)
+                .help("path-like prefix for the log files (fallbacks to stdout output)"),
+        )
+}
diff --git a/src/bin/oura/main.rs b/src/bin/oura/main.rs
@@ -4,7 +4,7 @@ mod watch;
 
 use std::process;
 
-use clap::{Arg, Command};
+use clap::Command;
 
 type Error = oura::Error;
 
@@ -13,66 +13,9 @@ fn main() {
         .name("oura")
         .about("the tail of cardano")
         .version(env!("CARGO_PKG_VERSION"))
-        .subcommand(
-            Command::new("watch")
-                .arg(Arg::new("socket").required(true))
-                .arg(
-                    Arg::new("bearer")
-                        .long("bearer")
-                        .takes_value(true)
-                        .possible_values(&["tcp", "unix"]),
-                )
-                .arg(Arg::new("magic").long("magic").takes_value(true))
-                .arg(Arg::new("since").long("since").takes_value(true).help(
-                    "point in the chain to start reading from, expects format `slot,hex-hash`",
-                ))
-                .arg(
-                    Arg::new("throttle")
-                        .long("throttle")
-                        .takes_value(true)
-                        .help("milliseconds to wait between output lines (for easier reading)"),
-                )
-                .arg(
-                    Arg::new("mode")
-                        .long("mode")
-                        .takes_value(true)
-                        .possible_values(&["node", "client"]),
-                ),
-        )
-        .subcommand(
-            Command::new("dump")
-                .arg(Arg::new("socket").required(true))
-                .arg(
-                    Arg::new("bearer")
-                        .long("bearer")
-                        .takes_value(true)
-                        .possible_values(&["tcp", "unix"]),
-                )
-                .arg(Arg::new("magic").long("magic").takes_value(true))
-                .arg(Arg::new("since").long("since").takes_value(true).help(
-                    "point in the chain to start reading from, expects format `slot,hex-hash`",
-                ))
-                .arg(
-                    Arg::new("mode")
-                        .long("mode")
-                        .takes_value(true)
-                        .possible_values(&["node", "client"]),
-                )
-                .arg(
-                    Arg::new("output")
-                        .long("output")
-                        .takes_value(true)
-                        .help("path-like prefix for the log files (fallbacks to stdout output)"),
-                ),
-        )
-        .subcommand(
-            Command::new("daemon").arg(
-                Arg::new("config")
-                    .long("config")
-                    .takes_value(true)
-                    .help("config file to load by the daemon"),
-            ),
-        )
+        .subcommand(watch::command_definition())
+        .subcommand(dump::command_definition())
+        .subcommand(daemon::command_definition())
         .arg_required_else_help(true)
         .get_matches();
 

diff --git a/src/bin/oura/watch.rs b/src/bin/oura/watch.rs
@@ -124,3 +124,34 @@ pub fn run(args: &ArgMatches) -> Result<(), Error> {
 
     Ok(())
 }
+
+/// Creates the clap definition for this sub-command
+pub(crate) fn command_definition<'a>() -> clap::Command<'a> {
+    clap::Command::new("watch")
+        .arg(clap::Arg::new("socket").required(true))
+        .arg(
+            clap::Arg::new("bearer")
+                .long("bearer")
+                .takes_value(true)
+                .possible_values(&["tcp", "unix"]),
+        )
+        .arg(clap::Arg::new("magic").long("magic").takes_value(true))
+        .arg(
+            clap::Arg::new("since")
+                .long("since")
+                .takes_value(true)
+                .help("point in the chain to start reading from, expects format `slot,hex-hash`"),
+        )
+        .arg(
+            clap::Arg::new("throttle")
+                .long("throttle")
+                .takes_value(true)
+                .help("milliseconds to wait between output lines (for easier reading)"),
+        )
+        .arg(
+            clap::Arg::new("mode")
+                .long("mode")
+                .takes_value(true)
+                .possible_values(&["node", "client"]),
+        )
+}