Address pr feedback.

stellar · Jun 26, 2024 · 338ad4c · 338ad4c
1 parent 2016aeb
commit 338ad4c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 20 deletions.
diff --git a/cmd/soroban-cli/src/commands/config/locator.rs b/cmd/soroban-cli/src/commands/config/locator.rs
@@ -9,7 +9,7 @@ use std::{
     path::{Path, PathBuf},
     str::FromStr,
 };
-use stellar_strkey::DecodeError;
+use stellar_strkey::{Contract, DecodeError};
 
 use crate::{utils::find_config_dir, Pwd};
 
@@ -280,28 +280,19 @@ impl Args {
         Ok(alias_data.ids.get(network_passphrase).cloned())
     }
 
-    pub fn resolve_contract_id_as_string(
+    pub fn resolve_contract_id(
         &self,
         alias_or_contract_id: &str,
         network_passphrase: &str,
-    ) -> Result<String, Error> {
+    ) -> Result<Contract, Error> {
         let contract_id = self
             .get_contract_id(alias_or_contract_id, network_passphrase)?
             .unwrap_or_else(|| alias_or_contract_id.to_string());
 
-        Ok(contract_id)
-    }
-
-    pub fn resolve_contract_id(
-        &self,
-        alias_or_contract_id: &str,
-        network_passphrase: &str,
-    ) -> Result<[u8; 32], Error> {
-        let contract_id =
-            self.resolve_contract_id_as_string(alias_or_contract_id, network_passphrase)?;
-
-        soroban_spec_tools::utils::contract_id_from_str(&contract_id)
-            .map_err(|e| Error::CannotParseContractId(contract_id.clone(), e))
+        Ok(Contract(
+            soroban_spec_tools::utils::contract_id_from_str(&contract_id)
+                .map_err(|e| Error::CannotParseContractId(contract_id.clone(), e))?,
+        ))
     }
 }
 

diff --git a/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs b/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
@@ -96,7 +96,8 @@ impl NetworkRunnable for Cmd {
 
             let contract_id = self
                 .locator
-                .resolve_contract_id(&self.contract_id, &network.network_passphrase)?;
+                .resolve_contract_id(&self.contract_id, &network.network_passphrase)?
+                .0;
 
             get_remote_contract_spec(
                 &contract_id,

diff --git a/cmd/soroban-cli/src/commands/contract/fetch.rs b/cmd/soroban-cli/src/commands/contract/fetch.rs
@@ -127,7 +127,8 @@ impl Cmd {
         let network = self.network()?;
         Ok(self
             .locator
-            .resolve_contract_id(&self.contract_id, &network.network_passphrase)?)
+            .resolve_contract_id(&self.contract_id, &network.network_passphrase)?
+            .0)
     }
 }
 

diff --git a/cmd/soroban-cli/src/commands/contract/invoke.rs b/cmd/soroban-cli/src/commands/contract/invoke.rs
@@ -313,7 +313,8 @@ impl NetworkRunnable for Cmd {
         let contract_id = self
             .config
             .locator
-            .resolve_contract_id(&self.contract_id, &network.network_passphrase)?;
+            .resolve_contract_id(&self.contract_id, &network.network_passphrase)?
+            .0;
         let spec_entries = self.spec_entries()?;
         if let Some(spec_entries) = &spec_entries {
             // For testing wasm arg parsing

diff --git a/cmd/soroban-cli/src/commands/events.rs b/cmd/soroban-cli/src/commands/events.rs
@@ -232,7 +232,8 @@ impl NetworkRunnable for Cmd {
             .iter()
             .map(|id| {
                 self.locator
-                    .resolve_contract_id_as_string(id, &network.network_passphrase)
+                    .resolve_contract_id(id, &network.network_passphrase)
+                    .map(|contract| contract.to_string())
             })
             .collect::<Result<Vec<_>, _>>()?;