callbacks: inline subcommand definitions

There is little use in going through the
trait for this.

Author: dspicher

src/callbacks/balances.rs

@@ -2,7 +2,7 @@ use std::fs::File;
 use std::io::{BufWriter, Write};
 use std::path::PathBuf;
 
-use clap::{Arg, ArgMatches, Command};
+use clap::ArgMatches;
 
 use crate::callbacks::Callback;
 
@@ -22,20 +22,6 @@ impl Balances {
 }
 
 impl Callback for Balances {
-    fn build_subcommand() -> Command
-    where
-        Self: Sized,
-    {
-        Command::new("balances")
-            .about("Dumps all addresses with non-zero balance to CSV file")
-            .arg(
-                Arg::new("dump-folder")
-                    .help("Folder to store csv file")
-                    .index(1)
-                    .required(true),
-            )
-    }
-
     fn new(matches: &ArgMatches) -> anyhow::Result<Self>
     where
         Self: Sized,

src/callbacks/mod.rs

@@ -1,4 +1,4 @@
-use clap::{ArgMatches, Command};
+use clap::ArgMatches;
 
 pub mod balances;
 pub mod opreturn;
@@ -9,12 +9,6 @@ pub mod unspentcsvdump;
 /// The parser ensures that the blocks arrive in the correct order.
 /// At this stage the main chain is already determined and orphans/stales are removed.
 pub trait Callback {
-    /// Builds Command to specify callback name and required args,
-    /// exits if some required args are missing.
-    fn build_subcommand() -> Command
-    where
-        Self: Sized;
-
     /// Instantiates callback
     fn new(matches: &ArgMatches) -> anyhow::Result<Self>
     where

src/callbacks/opreturn.rs

@@ -1,19 +1,11 @@
-use clap::{ArgMatches, Command};
+use clap::ArgMatches;
 
 use crate::callbacks::Callback;
 
 #[derive(Default)]
 pub struct OpReturn;
 
 impl Callback for OpReturn {
-    fn build_subcommand() -> Command
-    where
-        Self: Sized,
-    {
-        Command::new("opreturn")
-            .about("Shows embedded OP_RETURN data that is representable as UTF8")
-    }
-
     fn new(_: &ArgMatches) -> anyhow::Result<Self>
     where
         Self: Sized,

src/callbacks/simplestats.rs

@@ -2,7 +2,7 @@ use bitcoin::hashes::{sha256d, Hash};
 use std::collections::HashMap;
 use std::io::Write;
 
-use clap::{ArgMatches, Command};
+use clap::ArgMatches;
 
 use crate::callbacks::Callback;
 
@@ -174,13 +174,6 @@ impl SimpleStats {
 }
 
 impl Callback for SimpleStats {
-    fn build_subcommand() -> Command
-    where
-        Self: Sized,
-    {
-        Command::new("simplestats").about("Shows various Blockchain stats")
-    }
-
     fn new(_: &ArgMatches) -> anyhow::Result<Self>
     where
         Self: Sized,

src/callbacks/unspentcsvdump.rs

@@ -2,7 +2,7 @@ use std::fs::File;
 use std::io::{BufWriter, Write};
 use std::path::PathBuf;
 
-use clap::{Arg, ArgMatches, Command};
+use clap::ArgMatches;
 
 /// Dumps the UTXOs along with address in a csv file
 pub struct UnspentCsvDump {
@@ -22,20 +22,6 @@ impl UnspentCsvDump {
 }
 
 impl crate::callbacks::Callback for UnspentCsvDump {
-    fn build_subcommand() -> Command
-    where
-        Self: Sized,
-    {
-        Command::new("unspentcsvdump")
-            .about("Dumps the unspent outputs to CSV file")
-            .arg(
-                Arg::new("dump-folder")
-                    .help("Folder to store csv file")
-                    .index(1)
-                    .required(true),
-            )
-    }
-
     fn new(matches: &ArgMatches) -> anyhow::Result<Self>
     where
         Self: Sized,

src/lib.rs

@@ -95,10 +95,19 @@ pub fn command() -> Command {
         .value_parser(clap::value_parser!(u64))
         .help("Specify last block for parsing (inclusive) (default: all known blocks)"))
     // Add callbacks
-    .subcommand(UnspentCsvDump::build_subcommand())
-    .subcommand(SimpleStats::build_subcommand())
-    .subcommand(Balances::build_subcommand())
-    .subcommand(OpReturn::build_subcommand())
+    .subcommand(Command::new("unspentcsvdump").about("Dumps the unspent outputs to CSV file").arg(
+        Arg::new("dump-folder")
+            .help("Folder to store csv file")
+            .index(1)
+            .required(true)))
+    .subcommand(Command::new("simplestats").about("Shows various Blockchain stats"))
+    .subcommand(Command::new("balances").about("Dumps all addresses with non-zero balance to CSV file").arg(
+        Arg::new("dump-folder")
+            .help("Folder to store csv file")
+            .index(1)
+            .required(true),
+    ))
+    .subcommand(Command::new("opreturn").about("Shows embedded OP_RETURN data that is representable as UTF8"))
 }
 
 /// Returns default directory. TODO: test on windows