From 8a8d7fb9a870ba8a684c4b8a1cdc8331dae86b20 Mon Sep 17 00:00:00 2001
From: LaurensKubat <32776056+LaurensKubat@users.noreply.github.com>
Date: Mon, 31 Jul 2023 11:26:03 +0200
Subject: [PATCH] fix rebase

---
 smart-contracts/.cargo/config                    | 2 +-
 smart-contracts/contracts/lp-strategy/src/ibc.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/smart-contracts/.cargo/config b/smart-contracts/.cargo/config
index 69e9d4bd3..e6c803458 100644
--- a/smart-contracts/.cargo/config
+++ b/smart-contracts/.cargo/config
@@ -4,4 +4,4 @@ schema = "run --example schema"
 lint = "clippy -- -D warnings"
 unit-test = "test --lib"
 test-vault = "test --lib -p basic-vault"
-clip = "cargo clippy -- --D warnings --A deprecated"
\ No newline at end of file
+clip = "clippy -- --D warnings --A deprecated"
\ No newline at end of file
diff --git a/smart-contracts/contracts/lp-strategy/src/ibc.rs b/smart-contracts/contracts/lp-strategy/src/ibc.rs
index 9496073e2..6002fc50a 100644
--- a/smart-contracts/contracts/lp-strategy/src/ibc.rs
+++ b/smart-contracts/contracts/lp-strategy/src/ibc.rs
@@ -15,8 +15,8 @@ use crate::start_unbond::{batch_start_unbond, handle_start_unbond_ack};
 use crate::state::{
     LpCache, OngoingDeposit, PendingBond, CHANNELS, CONFIG, IBC_LOCK, IBC_TIMEOUT_TIME,
     ICA_CHANNEL, ICQ_CHANNEL, LP_SHARES, OSMO_LOCK, PENDING_ACK, RECOVERY_ACK, REJOIN_QUEUE,
-    SIMULATED_EXIT_RESULT, SIMULATED_JOIN_RESULT, TIMED_OUT, TOTAL_VAULT_BALANCE, TRAPS,
-    USABLE_COMPOUND_BALANCE,
+    SIMULATED_EXIT_RESULT, SIMULATED_JOIN_AMOUNT_IN, SIMULATED_JOIN_RESULT, TIMED_OUT,
+    TOTAL_VAULT_BALANCE, TRAPS, USABLE_COMPOUND_BALANCE,
 };
 use crate::unbond::{batch_unbond, transfer_batch_unbond, PendingReturningUnbonds};
 use cosmos_sdk_proto::cosmos::bank::v1beta1::QueryBalanceResponse;