Make crate imports consistent

stellar · Sep 26, 2024 · 59a96f2 · 59a96f2
1 parent e8f32ea
commit 59a96f2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 27 deletions.
diff --git a/cmd/soroban-cli/src/commands/contract/fetch.rs b/cmd/soroban-cli/src/commands/contract/fetch.rs
@@ -7,12 +7,14 @@ use std::{fmt::Debug, fs, io};
 
 use clap::{arg, command, Parser};
 
-use crate::commands::{global, NetworkRunnable};
-use crate::config::{
-    self, locator,
-    network::{self, Network},
+use crate::{
+    commands::{global, NetworkRunnable},
+    config::{
+        self, locator,
+        network::{self, Network},
+    },
+    wasm, Pwd,
 };
-use crate::{wasm, Pwd};
 
 #[derive(Parser, Debug, Default, Clone)]
 #[allow(clippy::struct_excessive_bools)]

diff --git a/cmd/soroban-cli/src/commands/contract/install.rs b/cmd/soroban-cli/src/commands/contract/install.rs
@@ -11,14 +11,19 @@ use soroban_env_host::xdr::{
 };
 
 use super::restore;
-use crate::commands::txn_result::{TxnEnvelopeResult, TxnResult};
-use crate::commands::{global, NetworkRunnable};
-use crate::config::{self, data, network};
-use crate::key;
-use crate::print::Print;
-use crate::rpc;
-use crate::rpc_client::{Error as RpcClientError, RpcClient};
-use crate::{utils, wasm};
+use crate::{
+    commands::{
+        global,
+        txn_result::{TxnEnvelopeResult, TxnResult},
+        NetworkRunnable,
+    },
+    config::{self, data, network},
+    key,
+    print::Print,
+    rpc,
+    rpc_client::{Error as RpcClientError, RpcClient},
+    utils, wasm,
+};
 
 const CONTRACT_META_SDK_KEY: &str = "rssdkver";
 const PUBLIC_NETWORK_PASSPHRASE: &str = "Public Global Stellar Network ; September 2015";

diff --git a/cmd/soroban-cli/src/commands/contract/invoke.rs b/cmd/soroban-cli/src/commands/contract/invoke.rs
@@ -23,16 +23,18 @@ use soroban_spec::read::FromWasmError;
 
 use super::super::events;
 use super::arg_parsing;
-use crate::commands::contract::arg_parsing::{build_host_function_parameters, output_to_string};
-use crate::commands::txn_result::{TxnEnvelopeResult, TxnResult};
-use crate::commands::NetworkRunnable;
-use crate::get_spec::{self, get_remote_contract_spec};
-use crate::print;
-use crate::rpc_client::{Error as RpcClientError, RpcClient};
 use crate::{
-    commands::global,
+    commands::{
+        contract::arg_parsing::{build_host_function_parameters, output_to_string},
+        global,
+        txn_result::{TxnEnvelopeResult, TxnResult},
+        NetworkRunnable,
+    },
     config::{self, data, locator, network},
-    rpc, Pwd,
+    get_spec::{self, get_remote_contract_spec},
+    print, rpc,
+    rpc_client::{Error as RpcClientError, RpcClient},
+    Pwd,
 };
 use soroban_spec_tools::contract;
 

diff --git a/cmd/soroban-cli/src/commands/events.rs b/cmd/soroban-cli/src/commands/events.rs
@@ -4,9 +4,11 @@ use std::io;
 use soroban_env_host::xdr::{self, Limits, ReadXdr};
 
 use super::{global, NetworkRunnable};
-use crate::config::{self, locator, network};
-use crate::rpc;
-use crate::rpc_client::{Error as RpcClientError, RpcClient};
+use crate::{
+    config::{self, locator, network},
+    rpc,
+    rpc_client::{Error as RpcClientError, RpcClient},
+};
 
 #[derive(Parser, Debug, Clone)]
 #[group(skip)]

diff --git a/cmd/soroban-cli/src/commands/tx/send.rs b/cmd/soroban-cli/src/commands/tx/send.rs
@@ -1,9 +1,11 @@
 use async_trait::async_trait;
 use soroban_rpc::GetTransactionResponse;
 
-use crate::commands::{global, NetworkRunnable};
-use crate::config::{self, locator, network};
-use crate::rpc_client::{Error as RpcClientError, RpcClient};
+use crate::{
+    commands::{global, NetworkRunnable},
+    config::{self, locator, network},
+    rpc_client::{Error as RpcClientError, RpcClient},
+};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {