Balance tools, add retries

Author: sungoki

src/cli.rs

@@ -22,6 +22,13 @@ pub enum SubCommand {
     Init,
     /// Shows information about the Goki workspace.
     Show,
+    /// Shows the balance of the deployer.
+    Balance {
+        /// Cluster.
+        #[clap(short, long)]
+        #[clap(default_value = "devnet")]
+        cluster: Cluster,
+    },
     /// Requests an airdrop of SOL from the Solana network.
     Airdrop {
         /// Cluster to request from.
@@ -172,12 +179,15 @@ impl Opts {
             } => {
                 subcommands::airdrop::process(
                     &workspace,
-                    cluster,
+                    &cluster,
                     amount.as_str(),
                     iterations,
                     interval,
                 )?;
             }
+            SubCommand::Balance { cluster } => {
+                subcommands::balance::process(&workspace, &cluster)?;
+            }
             SubCommand::Transfer {
                 cluster,
                 from,

src/subcommands/airdrop.rs

@@ -6,22 +6,28 @@ use crate::workspace::Workspace;
 
 pub fn process(
     workspace: &Workspace,
-    cluster: Cluster,
+    cluster: &Cluster,
     amount: &str,
     iterations: u32,
     interval: u64,
 ) -> Result<()> {
-    if cluster == Cluster::Mainnet {
+    if *cluster == Cluster::Mainnet {
         return Err(format_err!("cannot request an airdrop from mainnet"));
     }
 
-    for _ in 0..iterations {
-        workspace.exec_deployer_command(&cluster, |cmd| {
-            cmd.arg("airdrop").arg(amount);
-            Ok(())
-        })?;
+    let ctx = workspace.new_cluster_context(cluster)?;
+    let deployer = ctx.parse_wallet_alias("deployer")?;
 
-        thread::sleep(Duration::from_millis(interval));
+    for i in 0..iterations {
+        match ctx.exec_args(&["airdrop", amount], &deployer) {
+            Ok(_) => {}
+            Err(err) => {
+                println!("Error performing airdrop: {}", err);
+            }
+        }
+        if i != iterations - 1 {
+            thread::sleep(Duration::from_millis(interval));
+        }
     }
 
     Ok(())

src/subcommands/balance.rs

@@ -0,0 +1,14 @@
+use anchor_client::Cluster;
+use anyhow::Result;
+
+use crate::workspace::Workspace;
+
+pub fn process(workspace: &Workspace, cluster: &Cluster) -> Result<()> {
+    let ctx = workspace.new_cluster_context(cluster)?;
+    let deployer = ctx.parse_wallet_alias("deployer")?;
+
+    println!("Deployer:");
+    ctx.exec_args(&["account", &deployer], &deployer)?;
+
+    Ok(())
+}

src/subcommands/mod.rs

@@ -1,4 +1,5 @@
 pub mod airdrop;
+pub mod balance;
 pub mod deploy;
 pub mod init;
 pub mod pull;

src/utils.rs

@@ -82,7 +82,10 @@ pub fn exec_command(command: &mut Command) -> Result<Output> {
     print_command(command);
     let exit = exec_command_unhandled(command)?;
     if !exit.status.success() {
-        std::process::exit(exit.status.code().unwrap_or(1));
+        return Err(format_err!(
+            "Command returned with exit code {}",
+            exit.status.code().unwrap_or_default()
+        ));
     }
     Ok(exit)
 }