refactor: Moved liquidation items into finance

nolus-protocol · Jun 2, 2023 · 7eb4b73 · 7eb4b73
1 parent 087bdce
commit 7eb4b73
Show file tree

Hide file tree

Showing 6 changed files with 630 additions and 632 deletions.
diff --git a/contracts/lease/src/contract/cmd/liquidation_status.rs b/contracts/lease/src/contract/cmd/liquidation_status.rs
@@ -1,6 +1,9 @@
 use serde::{Deserialize, Serialize};
 
-use finance::{currency::Currency, liability::Zone};
+use finance::{
+    currency::Currency,
+    liability::{Cause, Liquidation, Status, Zone},
+};
 use lpp::stub::loan::LppLoan as LppLoanTrait;
 use oracle::stub::{Oracle as OracleTrait, OracleRef};
 use platform::batch::Batch;
@@ -10,7 +13,7 @@ use timealarms::stub::TimeAlarmsRef;
 use crate::{
     api::LeaseCoin,
     error::{ContractError, ContractResult},
-    lease::{with_lease::WithLease, Cause, Lease, LeaseDTO, Liquidation, Status},
+    lease::{with_lease::WithLease, Lease, LeaseDTO},
 };
 
 pub(crate) fn status_and_schedule<Lpn, Asset, Lpp, Oracle>(

diff --git a/contracts/lease/src/contract/state/opened/event.rs b/contracts/lease/src/contract/state/opened/event.rs
@@ -1,12 +1,12 @@
-use finance::liability::Level;
+use finance::liability::{Cause, Level};
 use platform::batch::{Emit, Emitter};
 use sdk::cosmwasm_std::Env;
 
 use crate::{
     api::DownpaymentCoin,
     contract::cmd::{LiquidationDTO, OpenLoanRespResult, ReceiptDTO},
     event::Type,
-    lease::{Cause, LeaseDTO},
+    lease::LeaseDTO,
 };
 
 pub(super) fn emit_lease_opened(