Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
0xLaurenzo committed Jul 31, 2023
1 parent db3dc68 commit 8a8d7fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion smart-contracts/.cargo/config
Original file line number Diff line number Diff line change
Expand Up @@ -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"
clip = "clippy -- --D warnings --A deprecated"
4 changes: 2 additions & 2 deletions smart-contracts/contracts/lp-strategy/src/ibc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8a8d7fb

Please sign in to comment.