fix: clean up

stellar · Jan 7, 2025 · 63f247e · 63f247e
1 parent aecc5ac
commit 63f247e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 25 deletions.
diff --git a/cmd/soroban-cli/src/commands/contract/arg_parsing.rs b/cmd/soroban-cli/src/commands/contract/arg_parsing.rs
@@ -14,9 +14,8 @@ use crate::xdr::{
 
 use crate::commands::txn_result::TxnResult;
 use crate::config::{
-    self, address,
+    self,
     sc_address::{self, UnresolvedScAddress},
-    secret,
 };
 use soroban_spec_tools::Spec;
 
@@ -42,10 +41,6 @@ pub enum Error {
     Xdr(#[from] xdr::Error),
     #[error(transparent)]
     StrVal(#[from] soroban_spec_tools::Error),
-    #[error(transparent)]
-    Address(#[from] address::Error),
-    #[error(transparent)]
-    Secret(#[from] secret::Error),
     #[error("Missing argument {0}")]
     MissingArgument(String),
     #[error("")]

diff --git a/cmd/soroban-cli/src/commands/keys/add.rs b/cmd/soroban-cli/src/commands/keys/add.rs
@@ -2,21 +2,17 @@ use clap::command;
 
 use crate::{
     commands::global,
-    config::{
-        address::{self, KeyName},
-        locator, secret,
-    },
+    config::{address::KeyName, locator, secret},
     print::Print,
 };
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error(transparent)]
     Secret(#[from] secret::Error),
+
     #[error(transparent)]
     Config(#[from] locator::Error),
-    #[error(transparent)]
-    Address(#[from] address::Error),
 }
 
 #[derive(Debug, clap::Parser, Clone)]

diff --git a/cmd/soroban-cli/src/commands/keys/address.rs b/cmd/soroban-cli/src/commands/keys/address.rs
@@ -1,21 +1,12 @@
 use clap::arg;
 
 use crate::{
-    commands::config::{address, locator, secret},
+    commands::config::{address, locator},
     config::UnresolvedMuxedAccount,
 };
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
-    #[error(transparent)]
-    Config(#[from] locator::Error),
-
-    #[error(transparent)]
-    Secret(#[from] secret::Error),
-
-    #[error(transparent)]
-    StrKey(#[from] stellar_strkey::DecodeError),
-
     #[error(transparent)]
     Address(#[from] address::Error),
 }

diff --git a/cmd/soroban-cli/src/config/address.rs b/cmd/soroban-cli/src/config/address.rs
@@ -55,8 +55,8 @@ impl UnresolvedMuxedAccount {
     ) -> Result<xdr::MuxedAccount, Error> {
         match self {
             UnresolvedMuxedAccount::Resolved(muxed_account) => Ok(muxed_account.clone()),
-            UnresolvedMuxedAccount::AliasOrSecret(alias) => {
-                Self::resolve_muxed_account_with_alias(alias, locator, hd_path)
+            UnresolvedMuxedAccount::AliasOrSecret(alias_or_secret) => {
+                Self::resolve_muxed_account_with_alias(alias_or_secret, locator, hd_path)
             }
         }
     }
@@ -78,7 +78,9 @@ impl UnresolvedMuxedAccount {
             UnresolvedMuxedAccount::Resolved(muxed_account) => {
                 Err(Error::CannotSign(muxed_account.clone()))
             }
-            UnresolvedMuxedAccount::AliasOrSecret(alias) => Ok(locator.key(alias)?),
+            UnresolvedMuxedAccount::AliasOrSecret(alias_or_secret) => {
+                Ok(locator.key(alias_or_secret)?)
+            }
         }
     }
 }