Remove network runnable abstraction. (#2364)

Author: fnando

cmd/crates/soroban-test/src/lib.rs

@@ -34,7 +34,7 @@ use assert_fs::{fixture::FixtureError, prelude::PathChild, TempDir};
 use fs_extra::dir::CopyOptions;
 
 use soroban_cli::{
-    commands::{contract::invoke, global, keys, NetworkRunnable},
+    commands::{contract::invoke, keys},
     config::{self, network},
     CommandParser,
 };
@@ -233,13 +233,14 @@ impl TestEnv {
         source: &str,
     ) -> Result<String, invoke::Error> {
         let cmd = self.cmd_with_config::<I, invoke::Cmd>(command_str, None);
-        self.run_cmd_with(cmd, source)
+        let config = self.clone_config(source);
+        cmd.execute(&config, false, false)
             .await
             .map(|tx| tx.into_result().unwrap())
     }
 
     /// A convenience method for using the invoke command.
-    pub fn cmd_with_config<I: AsRef<str>, T: CommandParser<T> + NetworkRunnable>(
+    pub fn cmd_with_config<I: AsRef<str>, T: CommandParser<T>>(
         &self,
         command_str: &[I],
         source_account: Option<&str>,
@@ -286,29 +287,6 @@ impl TestEnv {
         }
     }
 
-    /// Invoke an already parsed invoke command
-    pub async fn run_cmd_with<T: NetworkRunnable>(
-        &self,
-        cmd: T,
-        account: &str,
-    ) -> Result<T::Result, T::Error> {
-        let config = self.clone_config(account);
-
-        cmd.run_against_rpc_server(
-            Some(&global::Args {
-                locator: config.locator.clone(),
-                filter_logs: Vec::default(),
-                quiet: false,
-                verbose: false,
-                very_verbose: false,
-                list: false,
-                no_cache: false,
-            }),
-            Some(&config),
-        )
-        .await
-    }
-
     /// Reference to current directory of the `TestEnv`.
     pub fn dir(&self) -> &TempDir {
         &self.temp_dir

cmd/crates/soroban-test/tests/it/integration/bindings.rs

@@ -21,7 +21,7 @@ async fn invoke_test_generate_typescript_bindings() {
         &contract_id.to_string(),
     ]);
 
-    let result = sandbox.run_cmd_with(cmd, "test").await;
+    let result = cmd.execute(false).await;
 
     assert!(result.is_ok(), "Failed to generate TypeScript bindings");
 
@@ -51,7 +51,7 @@ async fn invoke_test_bindings_context_failure() {
         &contract_id.to_string(),
     ]);
 
-    let result = sandbox.run_cmd_with(cmd, "test").await;
+    let result = cmd.execute(false).await;
 
     assert!(result.is_ok(), "Failed to generate TypeScript bindings");
 

cmd/crates/soroban-test/tests/it/integration/hello_world.rs

@@ -17,7 +17,8 @@ async fn invoke_view_with_non_existent_source_account() {
     let id = deploy_hello(sandbox).await;
     let world = "world";
     let cmd = hello_world_cmd(&id, world);
-    let res = sandbox.run_cmd_with(cmd, "").await.unwrap();
+    let config = sandbox.clone_config("");
+    let res = cmd.execute(&config, false, false).await.unwrap();
     assert_eq!(res, TxnResult::Res(format!(r#"["Hello",{world:?}]"#)));
 }
 
@@ -172,7 +173,8 @@ fn hello_world_cmd(id: &str, arg: &str) -> contract::invoke::Cmd {
 
 async fn invoke_hello_world_with_lib(e: &TestEnv, id: &str) {
     let cmd = hello_world_cmd(id, "world");
-    let res = e.run_cmd_with(cmd, "test").await.unwrap();
+    let config = e.clone_config("test");
+    let res = cmd.execute(&config, false, false).await.unwrap();
     assert_eq!(res, TxnResult::Res(r#"["Hello","world"]"#.to_string()));
 }
 

cmd/crates/soroban-test/tests/it/integration/util.rs

@@ -90,10 +90,8 @@ pub async fn deploy_contract(
     );
     cmd.salt = salt;
 
-    let res = sandbox
-        .run_cmd_with(cmd, deployer.as_deref().unwrap_or("test"))
-        .await
-        .unwrap();
+    let config = sandbox.clone_config(deployer.as_deref().unwrap_or("test"));
+    let res = cmd.execute(&config, false, false).await.unwrap();
 
     match kind {
         DeployKind::Normal => (),

cmd/crates/soroban-test/tests/it/util.rs

@@ -53,8 +53,10 @@ pub async fn invoke_custom(
     let mut i: contract::invoke::Cmd =
         sandbox.cmd_with_config(&["--id", id, "--", func, arg], None);
     i.wasm = Some(wasm.to_path_buf());
-    let s = sandbox.run_cmd_with(i, TEST_ACCOUNT).await;
-    s.map(|tx| tx.into_result().unwrap())
+    let config = sandbox.clone_config(TEST_ACCOUNT);
+    i.execute(&config, false, false)
+        .await
+        .map(|tx| tx.into_result().unwrap())
 }
 
 pub const DEFAULT_CONTRACT_ID: &str = "CDR6QKTWZQYW6YUJ7UP7XXZRLWQPFRV6SWBLQS4ZQOSAF4BOUD77OO5Z";

cmd/soroban-cli/src/commands/container/start.rs

@@ -236,20 +236,22 @@ impl Runner {
     }
 
     fn get_protocol_version_arg(&self) -> String {
-        if self.network == Network::Local && self.args.protocol_version.is_some() {
-            let version = self.args.protocol_version.as_ref().unwrap();
-            format!("--protocol-version {version}")
-        } else {
-            String::new()
+        if self.network == Network::Local {
+            if let Some(version) = self.args.protocol_version.as_ref() {
+                return format!("--protocol-version {version}");
+            }
         }
+
+        String::new()
     }
 
     fn get_limits_arg(&self) -> String {
-        if self.network == Network::Local && self.args.limits.is_some() {
-            let limits = self.args.limits.as_ref().unwrap();
-            format!("--limits {limits}")
-        } else {
-            String::new()
+        if self.network == Network::Local {
+            if let Some(limits) = self.args.limits.as_ref() {
+                return format!("--limits {limits}");
+            }
         }
+
+        String::new()
     }
 }

cmd/soroban-cli/src/commands/contract/bindings/typescript.rs

@@ -4,11 +4,8 @@ use clap::Parser;
 use soroban_spec_tools::contract as spec_tools;
 use soroban_spec_typescript::boilerplate::Project;
 
+use crate::commands::contract::info::shared as contract_spec;
 use crate::print::Print;
-use crate::{
-    commands::{contract::info::shared as contract_spec, global, NetworkRunnable},
-    config,
-};
 use soroban_spec_tools::contract::Spec;
 
 #[derive(Parser, Debug, Clone)]
@@ -48,17 +45,13 @@ pub enum Error {
     Xdr(#[from] crate::xdr::Error),
 }
 
-#[async_trait::async_trait]
-impl NetworkRunnable for Cmd {
-    type Error = Error;
-    type Result = ();
+impl Cmd {
+    pub async fn run(&self) -> Result<(), Error> {
+        self.execute(false).await
+    }
 
-    async fn run_against_rpc_server(
-        &self,
-        global_args: Option<&global::Args>,
-        _config: Option<&config::Args>,
-    ) -> Result<(), Error> {
-        let print = Print::new(global_args.is_some_and(|a| a.quiet));
+    pub async fn execute(&self, quiet: bool) -> Result<(), Error> {
+        let print = Print::new(quiet);
 
         let contract_spec::Fetched { contract, source } =
             contract_spec::fetch(&self.wasm_or_hash_or_contract_id, &print).await?;
@@ -115,9 +108,3 @@ impl NetworkRunnable for Cmd {
         Ok(())
     }
 }
-
-impl Cmd {
-    pub async fn run(&self) -> Result<(), Error> {
-        self.run_against_rpc_server(None, None).await
-    }
-}

cmd/soroban-cli/src/commands/contract/deploy/asset.rs

@@ -16,7 +16,6 @@ use crate::{
     commands::{
         global,
         txn_result::{TxnEnvelopeResult, TxnResult},
-        NetworkRunnable,
     },
     config::{self, data, network},
     rpc::Error as SorobanRpcError,
@@ -98,7 +97,7 @@ pub struct Cmd {
 impl Cmd {
     pub async fn run(&self, global_args: &global::Args) -> Result<(), Error> {
         let res = self
-            .run_against_rpc_server(Some(global_args), None)
+            .execute(&self.config, global_args.quiet, global_args.no_cache)
             .await?
             .to_envelope();
         match res {
@@ -130,19 +129,13 @@ impl Cmd {
         }
         Ok(())
     }
-}
-
-#[async_trait::async_trait]
-impl NetworkRunnable for Cmd {
-    type Error = Error;
-    type Result = TxnResult<stellar_strkey::Contract>;
 
-    async fn run_against_rpc_server(
+    pub async fn execute(
         &self,
-        args: Option<&global::Args>,
-        config: Option<&config::Args>,
-    ) -> Result<Self::Result, Error> {
-        let config = config.unwrap_or(&self.config);
+        config: &config::Args,
+        quiet: bool,
+        no_cache: bool,
+    ) -> Result<TxnResult<stellar_strkey::Contract>, Error> {
         // Parse asset
         let asset = self.asset.resolve(&config.locator)?;
 
@@ -185,12 +178,12 @@ impl NetworkRunnable for Cmd {
         let assembled = self.resources.apply_to_assembled_txn(assembled);
         let txn = assembled.transaction().clone();
         let get_txn_resp = client
-            .send_transaction_polling(&self.config.sign(txn, args.is_some_and(|g| g.quiet)).await?)
+            .send_transaction_polling(&self.config.sign(txn, quiet).await?)
             .await?;
 
         self.resources.print_cost_info(&get_txn_resp)?;
 
-        if args.is_none_or(|a| !a.no_cache) {
+        if !no_cache {
             data::write(get_txn_resp.clone().try_into()?, &network.rpc_uri()?)?;
         }
 

cmd/soroban-cli/src/commands/contract/deploy/wasm.rs

@@ -22,7 +22,6 @@ use crate::{
         contract::{self, arg_parsing, id::wasm::get_contract_id, upload},
         global,
         txn_result::{TxnEnvelopeResult, TxnResult},
-        NetworkRunnable,
     },
     config::{self, data, locator, network},
     print::Print,
@@ -152,7 +151,7 @@ pub enum Error {
 impl Cmd {
     pub async fn run(&self, global_args: &global::Args) -> Result<(), Error> {
         let res = self
-            .run_against_rpc_server(Some(global_args), None)
+            .execute(&self.config, global_args.quiet, global_args.no_cache)
             .await?
             .to_envelope();
         match res {
@@ -184,23 +183,16 @@ impl Cmd {
         }
         Ok(())
     }
-}
-
-#[async_trait::async_trait]
-impl NetworkRunnable for Cmd {
-    type Error = Error;
-    type Result = TxnResult<stellar_strkey::Contract>;
 
     #[allow(clippy::too_many_lines)]
     #[allow(unused_variables)]
-    async fn run_against_rpc_server(
+    pub async fn execute(
         &self,
-        global_args: Option<&global::Args>,
-        config: Option<&config::Args>,
+        config: &config::Args,
+        quiet: bool,
+        no_cache: bool,
     ) -> Result<TxnResult<stellar_strkey::Contract>, Error> {
-        let quiet = global_args.is_some_and(|a| a.quiet);
         let print = Print::new(quiet);
-        let config = config.unwrap_or(&self.config);
         let wasm_hash = if let Some(wasm) = &self.wasm {
             let is_build = self.build_only;
             let hash = if is_build {
@@ -213,7 +205,7 @@ impl NetworkRunnable for Cmd {
                     ignore_checks: self.ignore_checks,
                     build_only: is_build,
                 }
-                .run_against_rpc_server(global_args, Some(config))
+                .execute(config, quiet, no_cache)
                 .await?
                 .into_result()
                 .expect("the value (hash) is expected because it should always be available since build-only is a shared parameter")
@@ -330,7 +322,7 @@ impl NetworkRunnable for Cmd {
 
         self.resources.print_cost_info(&get_txn_resp)?;
 
-        if global_args.is_none_or(|a| !a.no_cache) {
+        if !no_cache {
             data::write(get_txn_resp.clone().try_into()?, &network.rpc_uri()?)?;
         }
 

cmd/soroban-cli/src/commands/contract/extend.rs

@@ -21,7 +21,6 @@ use crate::{
     commands::{
         global,
         txn_result::{TxnEnvelopeResult, TxnResult},
-        NetworkRunnable,
     },
     config::{self, data, locator, network},
     key, rpc, wasm, Pwd,
@@ -131,7 +130,7 @@ impl Cmd {
     #[allow(clippy::too_many_lines)]
     pub async fn run(&self, global_args: &global::Args) -> Result<(), Error> {
         let res = self
-            .run_against_rpc_server(Some(global_args), None)
+            .execute(&self.config, global_args.quiet, global_args.no_cache)
             .await?
             .to_envelope();
         match res {
@@ -184,21 +183,14 @@ impl Cmd {
 
         Ok(self.ledgers_to_extend)
     }
-}
-
-#[async_trait::async_trait]
-impl NetworkRunnable for Cmd {
-    type Error = Error;
-    type Result = TxnResult<u32>;
 
     #[allow(clippy::too_many_lines)]
-    async fn run_against_rpc_server(
+    pub async fn execute(
         &self,
-        args: Option<&global::Args>,
-        config: Option<&config::Args>,
-    ) -> Result<TxnResult<u32>, Self::Error> {
-        let config = config.unwrap_or(&self.config);
-        let quiet = args.is_some_and(|a| a.quiet);
+        config: &config::Args,
+        quiet: bool,
+        no_cache: bool,
+    ) -> Result<TxnResult<u32>, Error> {
         let print = Print::new(quiet);
         let network = config.get_network()?;
         tracing::trace!(?network);
@@ -258,7 +250,7 @@ impl NetworkRunnable for Cmd {
             .await?;
         self.resources.print_cost_info(&res)?;
 
-        if args.is_none_or(|a| !a.no_cache) {
+        if !no_cache {
             data::write(res.clone().try_into()?, &network.rpc_uri()?)?;
         }