refactor(cli): merge argument parsing and command execution

crates/astria-cli/src/commands/bridge/collect.rs → crates/astria-cli/src/bridge/collect.rs

@@ -50,7 +50,7 @@ use tracing::{
 };
 
 #[derive(Args, Debug)]
-pub(crate) struct WithdrawalEvents {
+pub(crate) struct WithdrawalEventsArgs {
     /// The websocket endpoint of a geth compatible rollup.
     #[arg(long)]
     rollup_endpoint: String,
@@ -88,7 +88,7 @@ pub(crate) struct WithdrawalEvents {
     force: bool,
 }
 
-impl WithdrawalEvents {
+impl WithdrawalEventsArgs {
     pub(crate) async fn run(self) -> eyre::Result<()> {
         let Self {
             rollup_endpoint,

crates/astria-cli/src/bridge/mod.rs

@@ -0,0 +1,28 @@
+pub(crate) mod collect;
+pub(crate) mod submit;
+
+use clap::Subcommand;
+use color_eyre::eyre;
+
+/// Interact with a Sequencer node
+#[derive(Debug, clap::Args)]
+pub(super) struct Args {
+    #[command(subcommand)]
+    command: Command,
+}
+
+impl Args {
+    pub(super) async fn run(self) -> eyre::Result<()> {
+        match self.command {
+            Command::CollectWithdrawals(args) => args.run().await,
+            Command::SubmitWithdrawals(args) => args.run().await,
+        }
+    }
+}
+
+#[derive(Debug, Subcommand)]
+enum Command {
+    /// Commands for interacting with Sequencer accounts
+    CollectWithdrawals(collect::WithdrawalEventsArgs),
+    SubmitWithdrawals(submit::WithdrawalEventsArgs),
+}

crates/astria-cli/src/commands/bridge/submit.rs → crates/astria-cli/src/bridge/submit.rs

@@ -31,7 +31,7 @@ use tracing::{
 };
 
 #[derive(Args, Debug)]
-pub(crate) struct WithdrawalEvents {
+pub(crate) struct WithdrawalEventsArgs {
     #[arg(long, short)]
     input: PathBuf,
     #[arg(long)]
@@ -44,7 +44,7 @@ pub(crate) struct WithdrawalEvents {
     sequencer_url: String,
 }
 
-impl WithdrawalEvents {
+impl WithdrawalEventsArgs {
     pub(crate) async fn run(self) -> eyre::Result<()> {
         let signing_key = read_signing_key(&self.signing_key).wrap_err_with(|| {
             format!(