From 264715f2d0cc79f1abf2cd09a3ff18f2e7a21619 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:51:28 +1000 Subject: [PATCH] tidy --- cmd/crates/soroban-test/tests/it/integration/tx.rs | 8 ++++---- cmd/soroban-cli/src/commands/contract/extend.rs | 9 +++++++-- cmd/soroban-cli/src/commands/contract/install.rs | 4 +--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cmd/crates/soroban-test/tests/it/integration/tx.rs b/cmd/crates/soroban-test/tests/it/integration/tx.rs index 2a86ea3d6..5cc6bdb9b 100644 --- a/cmd/crates/soroban-test/tests/it/integration/tx.rs +++ b/cmd/crates/soroban-test/tests/it/integration/tx.rs @@ -1,3 +1,4 @@ +use soroban_cli::assembled::simulate_and_assemble_transaction; use soroban_sdk::xdr::{Limits, ReadXdr, TransactionEnvelope, WriteXdr}; use soroban_test::{AssertExt, TestEnv}; @@ -23,10 +24,9 @@ async fn simulate() { .success() .stdout_as_str(); assert_eq!(xdr_base64_sim_only, assembled_str); - let assembled = - soroban_cli::assembled::simulate_and_assemble_transaction(sandbox.client(), &tx) - .await - .unwrap(); + let assembled = simulate_and_assemble_transaction(&sandbox.client(), &tx) + .await + .unwrap(); let txn_env: TransactionEnvelope = assembled.transaction().clone().into(); assert_eq!( txn_env.to_xdr_base64(Limits::none()).unwrap(), diff --git a/cmd/soroban-cli/src/commands/contract/extend.rs b/cmd/soroban-cli/src/commands/contract/extend.rs index d9a7da810..3f7477254 100644 --- a/cmd/soroban-cli/src/commands/contract/extend.rs +++ b/cmd/soroban-cli/src/commands/contract/extend.rs @@ -9,11 +9,16 @@ use soroban_env_host::xdr::{ }; use crate::{ - assembled::simulate_and_assemble_transaction, commands::{ + assembled::simulate_and_assemble_transaction, + commands::{ global, txn_result::{TxnEnvelopeResult, TxnResult}, NetworkRunnable, - }, config::{self, data, locator, network}, key, rpc::{self, Client}, wasm, Pwd + }, + config::{self, data, locator, network}, + key, + rpc::{self, Client}, + wasm, Pwd, }; const MAX_LEDGERS_TO_EXTEND: u32 = 535_679; diff --git a/cmd/soroban-cli/src/commands/contract/install.rs b/cmd/soroban-cli/src/commands/contract/install.rs index b2c9621e9..b70cadb78 100644 --- a/cmd/soroban-cli/src/commands/contract/install.rs +++ b/cmd/soroban-cli/src/commands/contract/install.rs @@ -178,9 +178,7 @@ impl NetworkRunnable for Cmd { print.infoln("Simulating install transaction…"); - let txn = - simulate_and_assemble_transaction(&client, &tx_without_preflight) - .await?; + let txn = simulate_and_assemble_transaction(&client, &tx_without_preflight).await?; let txn = self.fee.apply_to_assembled_txn(txn).transaction().clone(); if self.fee.sim_only {