Fix 'account delete' command

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Added
 
 - It's possible to pass common arguments both before and after subcommand name, e.g. both `sncast --account default declare --contract_name name ...` and `sncast declare --account default --contract_name name ...` are allowed now.
+- Fixed `account delete` command. Now it isn't required to pass `--url` each time. It is needed to provide neither `--url` or `--network` argument only.
 
 ## [0.31.0] - 2024-09-26
 

crates/sncast/src/main.rs

@@ -430,12 +430,8 @@ async fn run_async_command(
             }
 
             account::Commands::Delete(delete) => {
-                let provider = delete.rpc.get_provider(&config).await?;
-
-                let network_name = match delete.network {
-                    Some(network) => network,
-                    None => chain_id_to_network_name(get_chain_id(&provider).await?),
-                };
+                let network_name =
+                    starknet_commands::account::delete::get_network_name(&delete, &config).await?;
 
                 let result = starknet_commands::account::delete::delete(
                     &delete.name,

crates/sncast/src/starknet_commands/account/delete.rs

@@ -3,8 +3,10 @@ use camino::Utf8PathBuf;
 use clap::Args;
 use promptly::prompt;
 use serde_json::Map;
+use sncast::helpers::configuration::CastConfig;
 use sncast::helpers::rpc::RpcArgs;
 use sncast::response::structs::AccountDeleteResponse;
+use sncast::{chain_id_to_network_name, get_chain_id};
 
 #[derive(Args, Debug)]
 #[command(about = "Delete account information from the accounts file")]
@@ -22,7 +24,7 @@ pub struct Delete {
     pub yes: bool,
 
     #[clap(flatten)]
-    pub rpc: RpcArgs,
+    pub rpc: Option<RpcArgs>,
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -71,3 +73,17 @@ pub fn delete(
     let result = "Account successfully removed".to_string();
     Ok(AccountDeleteResponse { result })
 }
+
+pub async fn get_network_name(delete: &Delete, config: &CastConfig) -> Result<String> {
+    match (&delete.rpc, &delete.network) {
+        (None, None) | (Some(_), Some(_)) => {
+            bail!("Provide either `rpc` or `network`");
+        }
+        (Some(rpc), None) => {
+            let provider = rpc.get_provider(config).await?;
+            let network_name = chain_id_to_network_name(get_chain_id(&provider).await?);
+            Ok(network_name)
+        }
+        (None, Some(network)) => Ok(network.clone()),
+    }
+}

crates/sncast/tests/e2e/account/delete.rs

@@ -11,8 +11,6 @@ pub fn test_no_accounts_in_network() {
         ACCOUNT_FILE_PATH,
         "account",
         "delete",
-        "--url",
-        URL,
         "--name",
         "user99",
         "--network",
@@ -31,6 +29,31 @@ pub fn test_no_accounts_in_network() {
     );
 }
 
+#[test]
+pub fn test_no_accounts_in_network_url() {
+    let args = vec![
+        "--accounts-file",
+        ACCOUNT_FILE_PATH,
+        "account",
+        "delete",
+        "--url",
+        URL,
+        "--name",
+        "user99",
+    ];
+
+    let snapbox = runner(&args);
+    let output = snapbox.assert().success();
+
+    assert_stderr_contains(
+        output,
+        indoc! {r"
+        command: account delete
+        error: Account with name user99 does not exist
+        "},
+    );
+}
+
 #[test]
 pub fn test_account_does_not_exist() {
     let args = vec![
@@ -68,8 +91,6 @@ pub fn test_delete_abort() {
         &accounts_file_name,
         "account",
         "delete",
-        "--url",
-        URL,
         "--name",
         "user3",
         "--network",
@@ -101,8 +122,6 @@ pub fn test_happy_case() {
         &accounts_file_name,
         "account",
         "delete",
-        "--url",
-        URL,
         "--name",
         "user3",
         "--network",
@@ -119,7 +138,7 @@ pub fn test_happy_case() {
 }
 
 #[test]
-pub fn test_happy_case_without_network_args() {
+pub fn test_happy_case_url() {
     // Creating dummy accounts test file
     let accounts_file_name = "temp_accounts.json";
     let temp_dir = create_tempdir_with_accounts_file(accounts_file_name, true);
@@ -146,7 +165,7 @@ pub fn test_happy_case_without_network_args() {
 }
 
 #[test]
-pub fn test_happy_case_with_yes_flag() {
+pub fn test_happy_case_without_network_args() {
     // Creating dummy accounts test file
     let accounts_file_name = "temp_accounts.json";
     let temp_dir = create_tempdir_with_accounts_file(accounts_file_name, true);
@@ -160,6 +179,31 @@ pub fn test_happy_case_with_yes_flag() {
         "--url",
         URL,
         "--name",
+        "user0",
+    ];
+
+    // Run test with an affirmative user input
+    let snapbox = runner(&args).current_dir(temp_dir.path()).stdin("Y");
+
+    snapbox.assert().success().stdout_matches(indoc! {r"
+        command: account delete
+        result: Account successfully removed
+    "});
+}
+
+#[test]
+pub fn test_happy_case_with_yes_flag() {
+    // Creating dummy accounts test file
+    let accounts_file_name = "temp_accounts.json";
+    let temp_dir = create_tempdir_with_accounts_file(accounts_file_name, true);
+
+    // Now delete dummy account
+    let args = vec![
+        "--accounts-file",
+        &accounts_file_name,
+        "account",
+        "delete",
+        "--name",
         "user3",
         "--network",
         "custom-network",
@@ -176,3 +220,35 @@ pub fn test_happy_case_with_yes_flag() {
         result: Account successfully removed
     "});
 }
+
+#[test]
+pub fn test_redundant_arguments() {
+    // Creating dummy accounts test file
+    let accounts_file_name = "temp_accounts.json";
+    let temp_dir = create_tempdir_with_accounts_file(accounts_file_name, true);
+
+    // Now delete dummy account
+    let args = vec![
+        "--accounts-file",
+        &accounts_file_name,
+        "account",
+        "delete",
+        "--url",
+        URL,
+        "--name",
+        "user3",
+        "--network",
+        "custom-network",
+    ];
+
+    // Run test with an affirmative user input
+    let snapbox = runner(&args).current_dir(temp_dir.path()).stdin("Y");
+
+    let output = snapbox.assert().failure();
+    assert_stderr_contains(
+        output,
+        indoc! {r"
+        Error: Provide either `rpc` or `network`
+        "},
+    );
+}