mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-22 06:40:53 +00:00
433630daf9
Conflict resolutions:
- include/xrpl/ledger/helpers/LendingHelpers.h,
src/libxrpl/ledger/helpers/LendingHelpers.cpp: Keep both branches' additions.
Preserve isPaymentLate() from lending-impairment alongside develop's new
cash-basis accounting helpers (accrual/cash_basis dispatchers).
- src/libxrpl/tx/transactors/lending/LoanManage.cpp: Rerere-resolved to
combine lending-impairment's featureLendingProtocolV1_1 gating with
develop's refactor from owedToVault() to loanVaultExposure().
- src/test/app/Loan_test.cpp (deleted upstream, modified locally): Accept
the deletion and migrate our four impairment/LoanPay regression tests
into src/test/app/lending/LoanSecurity_test.cpp:
* testImpairmentPaymentDateUnchanged
* testImpairmentPaymentDatePreAmendment
* testImpairedOverdueLoanPayRequiresLateFlag
* testImpairedOverdueLoanPayBypassPreAmendment
- src/test/app/lending/LoanCashBasis_test.cpp: Adjust the impair calls in
runImpairUnimpair, runDefault, and testLegacyVaultKeepsAccrualAfterAmendmentEnabled
to advance the clock past sfNextPaymentDueDate before impairing, since
featureLendingProtocolV1_1 now rejects impairment on non-late loans.