single-pool-cli: move initialize/reactivate/metadata into subcommand

Author: 2501babe

single-pool/cli/src/cli.rs

@@ -71,15 +71,9 @@ pub struct Cli {
 
 #[derive(Clone, Debug, Subcommand)]
 pub enum Command {
-    /// Permissionlessly create the single-validator stake pool for a given validator vote account
-    /// if one does not already exist. The fee payer also pays rent-exemption for accounts,
-    /// along with the cluster-configured minimum stake delegation
-    Initialize(InitializeCli),
-
-    /// Permissionlessly re-stake the pool stake account in the case when it has been deactivated.
-    /// This may happen if the validator is force-deactivated, and then later reactivated using
-    /// the same address for its vote account.
-    Reactivate(ReactivateCli),
+    /// Commands used to initialize or manage existing single-validator stake pools.
+    /// Other than initializing new pools, most users should never need to use these.
+    Manage(ManageCli),
 
     /// Deposit delegated stake into a pool in exchange for pool tokens, closing out
     /// the original stake account. Provide either a stake account address, or a
@@ -92,20 +86,39 @@ pub enum Command {
     /// or the ALL keyword to burn all.
     Withdraw(WithdrawCli),
 
+    /// Create and delegate a new stake account to a given validator, using a default address
+    /// linked to the intended depository pool
+    CreateDefaultStake(CreateStakeCli),
+
+    /// Display info for one or all single single-validator stake pool(s)
+    Display(DisplayCli),
+}
+
+#[derive(Clone, Debug, Parser)]
+pub struct ManageCli {
+    #[clap(subcommand)]
+    pub manage: ManageCommand,
+}
+
+#[derive(Clone, Debug, Subcommand)]
+pub enum ManageCommand {
+    /// Permissionlessly create the single-validator stake pool for a given validator vote account
+    /// if one does not already exist. The fee payer also pays rent-exemption for accounts,
+    /// along with the cluster-configured minimum stake delegation
+    Initialize(InitializeCli),
+
+    /// Permissionlessly re-stake the pool stake account in the case when it has been deactivated.
+    /// This may happen if the validator is force-deactivated, and then later reactivated using
+    /// the same address for its vote account.
+    Reactivate(ReactivateCli),
+
     /// Permissionlessly create default MPL token metadata for the pool mint. Normally this is done
     /// automatically upon initialization, so this does not need to be called.
     CreateTokenMetadata(CreateMetadataCli),
 
     /// Modify the MPL token metadata associated with the pool mint. This action can only be
     /// performed by the validator vote account's withdraw authority
     UpdateTokenMetadata(UpdateMetadataCli),
-
-    /// Create and delegate a new stake account to a given validator, using a default address
-    /// linked to the intended depository pool
-    CreateDefaultStake(CreateStakeCli),
-
-    /// Display info for one or all single single-validator stake pool(s)
-    Display(DisplayCli),
 }
 
 #[derive(Clone, Debug, Args)]
@@ -408,7 +421,9 @@ impl Command {
                     "token_authority",
                 )?;
             }
-            Command::UpdateTokenMetadata(ref mut config) => {
+            Command::Manage(ManageCli {
+                manage: ManageCommand::UpdateTokenMetadata(ref mut config),
+            }) => {
                 config.authorized_withdrawer = with_signer(
                     matches,
                     wallet_manager,

single-pool/cli/src/main.rs

@@ -60,16 +60,22 @@ pub type CommandResult = Result<String, Error>;
 impl Command {
     pub async fn execute(self, config: &Config) -> CommandResult {
         match self {
-            Command::Initialize(command_config) => command_initialize(config, command_config).await,
-            Command::Reactivate(command_config) => command_reactivate(config, command_config).await,
+            Command::Manage(command) => match command.manage {
+                ManageCommand::Initialize(command_config) => {
+                    command_initialize(config, command_config).await
+                }
+                ManageCommand::Reactivate(command_config) => {
+                    command_reactivate(config, command_config).await
+                }
+                ManageCommand::CreateTokenMetadata(command_config) => {
+                    command_create_metadata(config, command_config).await
+                }
+                ManageCommand::UpdateTokenMetadata(command_config) => {
+                    command_update_metadata(config, command_config).await
+                }
+            },
             Command::Deposit(command_config) => command_deposit(config, command_config).await,
             Command::Withdraw(command_config) => command_withdraw(config, command_config).await,
-            Command::CreateTokenMetadata(command_config) => {
-                command_create_metadata(config, command_config).await
-            }
-            Command::UpdateTokenMetadata(command_config) => {
-                command_update_metadata(config, command_config).await
-            }
             Command::CreateDefaultStake(command_config) => {
                 command_create_stake(config, command_config).await
             }

single-pool/cli/tests/test.rs

@@ -39,6 +39,7 @@ pub struct Env {
     pub rpc_client: Arc<RpcClient>,
     pub program_client: PClient,
     pub payer: Keypair,
+    pub keypair_file_path: String,
     pub config_file_path: String,
     pub vote_account: Pubkey,
 
@@ -79,6 +80,7 @@ async fn setup(initialize: bool) -> Env {
     if initialize {
         let status = Command::new(SVSP_CLI)
             .args([
+                "manage",
                 "initialize",
                 "-C",
                 config_file_path,
@@ -93,6 +95,7 @@ async fn setup(initialize: bool) -> Env {
         rpc_client,
         program_client,
         payer,
+        keypair_file_path: keypair_file.path().to_str().unwrap().to_string(),
         config_file_path: config_file_path.to_string(),
         vote_account,
         validator,
@@ -257,6 +260,7 @@ async fn reactivate() {
     // so we just make sure the cli can send a well-formed instruction
     let output = Command::new(SVSP_CLI)
         .args([
+            "manage",
             "reactivate",
             "-C",
             &env.config_file_path,
@@ -360,6 +364,7 @@ async fn create_metadata() {
 
     let status = Command::new(SVSP_CLI)
         .args([
+            "manage",
             "initialize",
             "-C",
             &env.config_file_path,
@@ -372,6 +377,7 @@ async fn create_metadata() {
 
     let status = Command::new(SVSP_CLI)
         .args([
+            "manage",
             "create-token-metadata",
             "-C",
             &env.config_file_path,
@@ -390,6 +396,7 @@ async fn update_metadata() {
 
     let status = Command::new(SVSP_CLI)
         .args([
+            "manage",
             "update-token-metadata",
             "-C",
             &env.config_file_path,
@@ -401,4 +408,22 @@ async fn update_metadata() {
         .status()
         .unwrap();
     assert!(status.success());
+
+    // testing this flag because the match is rather torturous
+    let status = Command::new(SVSP_CLI)
+        .args([
+            "manage",
+            "update-token-metadata",
+            "-C",
+            &env.config_file_path,
+            "--vote-account",
+            &env.vote_account.to_string(),
+            "--authorized-withdrawer",
+            &env.keypair_file_path,
+            "something",
+            "new",
+        ])
+        .status()
+        .unwrap();
+    assert!(status.success());
 }