rename api name

centrifuge · May 8, 2024 · a864ad4 · a864ad4
1 parent a60d0fd
commit a864ad4
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/pallets/loans/src/entities/loans.rs b/pallets/loans/src/entities/loans.rs
@@ -248,7 +248,7 @@ impl<T: Config> ActiveLoan<T> {
 			.ensure_sub(self.total_repaid.principal)?)
 	}
 
-	pub fn cashflow(&self) -> Result<Vec<CashflowPayment<T::Balance>>, DispatchError> {
+	pub fn expected_cashflows(&self) -> Result<Vec<CashflowPayment<T::Balance>>, DispatchError> {
 		self.schedule.generate_cashflows(
 			self.repayments_on_schedule_until,
 			self.principal()?,

diff --git a/pallets/loans/src/lib.rs b/pallets/loans/src/lib.rs
@@ -1215,14 +1215,14 @@ pub mod pallet {
 				.transpose()
 		}
 
-		pub fn cashflow(
+		pub fn expected_cashflows(
 			pool_id: T::PoolId,
 			loan_id: T::LoanId,
 		) -> Result<Vec<CashflowPayment<T::Balance>>, DispatchError> {
 			ActiveLoans::<T>::get(pool_id)
 				.into_iter()
 				.find(|(id, _)| *id == loan_id)
-				.map(|(_, loan)| loan.cashflow())
+				.map(|(_, loan)| loan.expected_cashflows())
 				.ok_or(Error::<T>::LoanNotActiveOrNotFound)?
 		}
 	}

diff --git a/pallets/loans/src/tests/borrow_loan.rs b/pallets/loans/src/tests/borrow_loan.rs
@@ -655,7 +655,7 @@ mod cashflow {
 			let interest = Rate::from_float(interest_rate_per_month).saturating_mul_int(principal);
 
 			assert_eq!(
-				loan.cashflow()
+				loan.expected_cashflows()
 					.unwrap()
 					.into_iter()
 					.map(|payment| (payment.when, payment.principal, payment.interest))
@@ -691,7 +691,7 @@ mod cashflow {
 				PrincipalInput::Internal(COLLATERAL_VALUE / 2)
 			));
 
-			let cashflow = util::get_loan(loan_id).cashflow().unwrap();
+			let cashflow = util::get_loan(loan_id).expected_cashflows().unwrap();
 
 			let time_until_next_month = Duration::from_secs(cashflow[0].when) - now();
 			advance_time(time_until_next_month);
@@ -719,7 +719,7 @@ mod cashflow {
 				PrincipalInput::Internal(COLLATERAL_VALUE / 2)
 			));
 
-			let cashflow = util::get_loan(loan_id).cashflow().unwrap();
+			let cashflow = util::get_loan(loan_id).expected_cashflows().unwrap();
 
 			let time_until_next_month = Duration::from_secs(cashflow[0].when) - now();
 			advance_time(time_until_next_month);
@@ -753,7 +753,7 @@ mod cashflow {
 				PrincipalInput::Internal(COLLATERAL_VALUE / 2)
 			));
 
-			let cashflow = util::get_loan(loan_id).cashflow().unwrap();
+			let cashflow = util::get_loan(loan_id).expected_cashflows().unwrap();
 
 			let time_until_next_month = Duration::from_secs(cashflow[0].when) - now();
 			advance_time(time_until_next_month);

diff --git a/runtime/altair/src/lib.rs b/runtime/altair/src/lib.rs
@@ -2352,12 +2352,11 @@ impl_runtime_apis! {
 			Ok(runtime_common::update_nav_with_input(pool_id, input_prices)?.nav_aum)
 		}
 
-		fn cashflow(pool_id: PoolId, loan_id: LoanId) -> Result<Vec<CashflowPayment<Balance>>, DispatchError> {
-			Loans::cashflow(pool_id, loan_id)
+		fn expected_cashflows(pool_id: PoolId, loan_id: LoanId) -> Result<Vec<CashflowPayment<Balance>>, DispatchError> {
+			Loans::expected_cashflows(pool_id, loan_id)
 		}
 	}
 
-
 	// Investment Runtime APIs
 	impl runtime_common::apis::InvestmentsApi<Block, AccountId, TrancheCurrency, InvestmentPortfolio<Balance, CurrencyId>> for Runtime {
 		fn investment_portfolio(account_id: AccountId) -> Vec<(TrancheCurrency, InvestmentPortfolio<Balance, CurrencyId>)> {

diff --git a/runtime/centrifuge/src/lib.rs b/runtime/centrifuge/src/lib.rs
@@ -2400,8 +2400,8 @@ impl_runtime_apis! {
 			Ok(runtime_common::update_nav_with_input(pool_id, input_prices)?.nav_aum)
 		}
 
-		fn cashflow(pool_id: PoolId, loan_id: LoanId) -> Result<Vec<CashflowPayment<Balance>>, DispatchError> {
-			Loans::cashflow(pool_id, loan_id)
+		fn expected_cashflows(pool_id: PoolId, loan_id: LoanId) -> Result<Vec<CashflowPayment<Balance>>, DispatchError> {
+			Loans::expected_cashflows(pool_id, loan_id)
 		}
 	}
 

diff --git a/runtime/common/src/apis/loans.rs b/runtime/common/src/apis/loans.rs
@@ -31,6 +31,6 @@ decl_runtime_apis! {
 		fn portfolio(pool_id: PoolId) -> Vec<(LoanId, Loan)>;
 		fn portfolio_loan(pool_id: PoolId, loan_id: LoanId) -> Option<Loan>;
 		fn portfolio_valuation(pool_id: PoolId, input_prices: PriceCollectionInput) -> Result<Balance, DispatchError>;
-		fn cashflow(pool_id: PoolId, loan_id: LoanId) -> Result<Vec<CashflowPayment<Balance>>, DispatchError>;
+		fn expected_cashflows(pool_id: PoolId, loan_id: LoanId) -> Result<Vec<CashflowPayment<Balance>>, DispatchError>;
 	}
 }
diff --git a/runtime/development/src/lib.rs b/runtime/development/src/lib.rs
@@ -2439,8 +2439,8 @@ impl_runtime_apis! {
 			Ok(runtime_common::update_nav_with_input(pool_id, input_prices)?.nav_aum)
 		}
 
-		fn cashflow(pool_id: PoolId, loan_id: LoanId) -> Result<Vec<CashflowPayment<Balance>>, DispatchError> {
-			Loans::cashflow(pool_id, loan_id)
+		fn expected_cashflows(pool_id: PoolId, loan_id: LoanId) -> Result<Vec<CashflowPayment<Balance>>, DispatchError> {
+			Loans::expected_cashflows(pool_id, loan_id)
 		}
 	}