From 89b331500f399f4cc59956f23fd028b3338f542a Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Thu, 11 Jan 2024 15:21:06 -0500
Subject: [PATCH] fix: rebase conflicts

---
 Cargo.lock                                             |  4 ++--
 .../src/commands/contract/bindings/typescript.rs       | 10 +++-------
 cmd/soroban-cli/src/commands/contract/deploy/wasm.rs   |  3 ++-
 cmd/soroban-cli/src/commands/events.rs                 |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b6678b7ae..0f8ec508c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2696,7 +2696,7 @@ dependencies = [
  "sha2 0.10.8",
  "soroban-env-host",
  "soroban-sdk",
- "soroban-spec",
+ "soroban-spec 20.0.3",
  "soroban-spec-tools",
  "stellar-strkey 0.0.7",
  "stellar-xdr",
@@ -2822,8 +2822,8 @@ dependencies = [
  "hex",
  "itertools 0.10.5",
  "serde_json",
- "soroban-spec 20.0.3",
  "soroban-env-host",
+ "soroban-spec 20.0.3",
  "stellar-strkey 0.0.7",
  "stellar-xdr",
  "thiserror",
diff --git a/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs b/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
index cd616f069..bfe17eec8 100644
--- 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
index 76c130173..3b646429c 100644
--- 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
index 6264a93f7..b5826eaa4 100644
--- 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;