fix: rebase conflicts

stellar · Jan 11, 2024 · 89b3315 · 89b3315
1 parent 19e64a8
commit 89b3315
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs b/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
@@ -4,14 +4,10 @@ use clap::{command, Parser};
 use soroban_spec_tools::contract as contract_spec;
 use soroban_spec_typescript::{self as typescript, boilerplate::Project};
 
-use crate::wasm;
-use crate::{
-    commands::{
-        config::locator,
-        contract::{self, fetch},
-        network::{self, Network},
-    },
+use crate::commands::{
+    config::locator,
     contract::{self, fetch},
+    network::{self, Network},
 };
 use crate::wasm;
 

diff --git a/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs b/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs
@@ -17,9 +17,10 @@ use soroban_env_host::{
 use crate::commands::contract::{self, id::wasm::get_contract_id};
 use crate::{
     commands::{config, contract::install, HEADING_RPC},
-    rpc::{self, Client},
     utils, wasm,
 };
+use rpc::Client;
+use soroban_rpc as rpc;
 
 #[derive(Parser, Debug, Clone)]
 #[command(group(

diff --git a/cmd/soroban-cli/src/commands/events.rs b/cmd/soroban-cli/src/commands/events.rs
@@ -1,7 +1,7 @@
 use clap::{arg, command, Parser};
 use std::io;
 
-use super::config::{locator, network};
+use super::{config::locator, network};
 use crate::utils;
 use soroban_env_host::xdr::{self, Limits, ReadXdr};
 use soroban_rpc as rpc;