From 2856eab8080879ddf91d876bd32482dfaaabce35 Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Tue, 30 Jul 2024 11:22:55 -0400
Subject: [PATCH] fix: improve arg name and don't use `self.config`

---
 cmd/soroban-cli/src/commands/contract/invoke.rs | 6 +++++-
 cmd/soroban-cli/src/config/network.rs           | 1 -
 cmd/soroban-cli/src/config/sign_with.rs         | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cmd/soroban-cli/src/commands/contract/invoke.rs b/cmd/soroban-cli/src/commands/contract/invoke.rs
index 41095b1bf..c05639f99 100644
--- a/cmd/soroban-cli/src/commands/contract/invoke.rs
+++ b/cmd/soroban-cli/src/commands/contract/invoke.rs
@@ -319,9 +319,13 @@ impl NetworkRunnable for Cmd {
         config: Option<&config::Args>,
     ) -> Result<TxnResult<String>, Error> {
         let config = config.unwrap_or(&self.config);
+        eprintln!(
+            "Invoking contract {} on config {config:#?}...",
+            self.contract_id
+        );
         let network = config.get_network()?;
         tracing::trace!(?network);
-        let contract_id = self.config.resolve_contract_id(&self.contract_id)?.0;
+        let contract_id = config.resolve_contract_id(&self.contract_id)?.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/config/network.rs b/cmd/soroban-cli/src/config/network.rs
index 924060db9..d332fa904 100644
--- a/cmd/soroban-cli/src/config/network.rs
+++ b/cmd/soroban-cli/src/config/network.rs
@@ -68,7 +68,6 @@ pub struct Args {
 
 impl Args {
     pub fn get(&self, locator: &locator::Args) -> Result<Network, Error> {
-        println!("{self:#?}");
         if let Some(name) = self.network.as_deref() {
             if let Ok(network) = locator.read_network(name) {
                 return Ok(network);
diff --git a/cmd/soroban-cli/src/config/sign_with.rs b/cmd/soroban-cli/src/config/sign_with.rs
index f79499c1e..3efb261aa 100644
--- a/cmd/soroban-cli/src/config/sign_with.rs
+++ b/cmd/soroban-cli/src/config/sign_with.rs
@@ -91,11 +91,11 @@ impl Args {
     pub async fn sign_soroban_authorizations(
         &self,
         tx: &Transaction,
-        ledgers_from_current: u32,
+        expiration_ledger: u32,
     ) -> Result<Option<Transaction>, Error> {
         Ok(self
             .signer()?
-            .sign_soroban_authorizations(tx, &self.get_network()?, ledgers_from_current)
+            .sign_soroban_authorizations(tx, &self.get_network()?, expiration_ledger)
             .await?)
     }
 
@@ -111,6 +111,7 @@ impl Args {
     }
 
     pub fn get_network(&self) -> Result<Network, Error> {
+        eprintln!("{self:#?}");
         Ok(self.network.get(&self.locator)?)
     }