better fix

centrifuge · May 22, 2024 · 78b83b8 · 78b83b8
1 parent 652c102
commit 78b83b8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/pallets/loans/src/entities/loans.rs b/pallets/loans/src/entities/loans.rs
@@ -14,7 +14,7 @@ use sp_runtime::{
 	},
 	DispatchError,
 };
-use sp_std::{cmp::min, collections::btree_map::BTreeMap};
+use sp_std::collections::btree_map::BTreeMap;
 
 use crate::{
 	entities::{
@@ -359,8 +359,7 @@ impl<T: Config> ActiveLoan<T> {
 				inner.adjust(Adjustment::Increase(amount.balance()?))?
 			}
 			ActivePricing::External(inner) => {
-				let when = T::Time::now();
-				inner.adjust(Adjustment::Increase(amount.external()?), Zero::zero(), when)?
+				inner.adjust(Adjustment::Increase(amount.external()?), Zero::zero())?
 			}
 		}
 
@@ -434,8 +433,7 @@ impl<T: Config> ActiveLoan<T> {
 			}
 			ActivePricing::External(inner) => {
 				let principal = amount.principal.external()?;
-				let when = min(T::Time::now(), self.schedule.maturity.date());
-				inner.adjust(Adjustment::Decrease(principal), amount.interest, when)?;
+				inner.adjust(Adjustment::Decrease(principal), amount.interest)?;
 			}
 		}
 

diff --git a/pallets/loans/src/entities/pricing/external.rs b/pallets/loans/src/entities/pricing/external.rs
@@ -9,7 +9,7 @@ use sp_runtime::{
 	traits::{EnsureAdd, EnsureFixedPointNumber, EnsureSub, Zero},
 	ArithmeticError, DispatchError, DispatchResult, FixedPointNumber,
 };
-use sp_std::collections::btree_map::BTreeMap;
+use sp_std::{cmp::min, collections::btree_map::BTreeMap};
 
 use crate::{
 	entities::interest::ActiveInterestRate,
@@ -166,9 +166,9 @@ impl<T: Config> ExternalActivePricing<T> {
 	) -> Result<T::Balance, DispatchError> {
 		if self.info.with_linear_pricing {
 			Ok(cfg_utils::math::y_coord_in_rect(
-				(price_last_updated, price),
+				(min(price_last_updated, maturity), price),
 				(maturity, self.info.notional),
-				T::Time::now(),
+				min(T::Time::now(), maturity),
 			)?)
 		} else {
 			Ok(price)
@@ -302,7 +302,6 @@ impl<T: Config> ExternalActivePricing<T> {
 		&mut self,
 		amount_adj: Adjustment<ExternalAmount<T>>,
 		interest: T::Balance,
-		when: Seconds,
 	) -> DispatchResult {
 		self.outstanding_quantity = amount_adj
 			.clone()
@@ -318,7 +317,7 @@ impl<T: Config> ExternalActivePricing<T> {
 
 		self.interest.adjust_debt(interest_adj)?;
 		self.latest_settlement_price = amount_adj.abs().settlement_price;
-		self.settlement_price_updated = when;
+		self.settlement_price_updated = T::Time::now();
 
 		Ok(())
 	}

diff --git a/pallets/loans/src/tests/mod.rs b/pallets/loans/src/tests/mod.rs
@@ -11,7 +11,7 @@ use super::{
 	entities::{
 		changes::{Change, InternalMutation, LoanMutation},
 		input::{PrincipalInput, RepaidInput},
-		loans::{ActiveLoan, LoanInfo},
+		loans::{ActiveLoan, ActiveLoanInfo, LoanInfo},
 		pricing::{
 			external::{ExternalAmount, ExternalPricing, MaxBorrowAmount as ExtMaxBorrowAmount},
 			internal::{InternalPricing, MaxBorrowAmount as IntMaxBorrowAmount},

diff --git a/pallets/loans/src/tests/repay_loan.rs b/pallets/loans/src/tests/repay_loan.rs
@@ -824,7 +824,7 @@ fn with_external_pricing_and_overdue() {
 		util::borrow_loan(loan_id, PrincipalInput::External(amount));
 
 		// The loan is overdue
-		advance_time(YEAR * 2);
+		advance_time(YEAR * DAY);
 
 		let amount = ExternalAmount::new(QUANTITY, PRICE_VALUE);
 		config_mocks(amount.balance().unwrap());
@@ -839,14 +839,12 @@ fn with_external_pricing_and_overdue() {
 			},
 		));
 
-		let active_loan = util::get_loan(loan_id);
-
-		let settlement_price_updated = match active_loan.pricing() {
-			ActivePricing::External(inner) => inner.settlement_price_updated(),
-			_ => unreachable!(),
-		};
-
-		// We must never overpass madurity date
-		assert_eq!(active_loan.maturity_date(), settlement_price_updated);
+		assert_eq!(
+			ActiveLoanInfo::try_from((POOL_A, util::get_loan(loan_id)))
+				.unwrap()
+				.current_price
+				.unwrap(),
+			NOTIONAL
+		);
 	});
 }