Skip to content

Commit

Permalink
Fix: mostly non failable runtime-api (#1810)
Browse files Browse the repository at this point in the history
  • Loading branch information
mustermeiszer authored Apr 15, 2024
1 parent 94ee4d7 commit c63c370
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions pallets/pool-fees/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ pub mod pallet {
///
/// Lifetime of a storage entry: Forever, inherited from pool lifetime.
#[pallet::storage]
#[pallet::getter(fn portfolio_valuation)]
pub(crate) type PortfolioValuation<T: Config> = StorageMap<
_,
Blake2_128Concat,
Expand Down
17 changes: 13 additions & 4 deletions runtime/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,21 @@ where
{
let mut pool = pallet_pool_system::Pool::<T>::get(pool_id)
.ok_or(pallet_pool_system::Error::<T>::NoSuchPool)?;
let (nav_loans, _) =
pallet_loans::Pallet::<T>::update_portfolio_valuation_for_pool(pool_id, price_input)?;
let (nav_fees, _) = pallet_pool_fees::Pallet::<T>::update_portfolio_valuation_for_pool(

let prev_nav_loans = pallet_loans::Pallet::<T>::portfolio_valuation(pool_id).value();
let nav_loans =
pallet_loans::Pallet::<T>::update_portfolio_valuation_for_pool(pool_id, price_input)
.map(|(nav_loans, _)| nav_loans)
.unwrap_or(prev_nav_loans);

let prev_fees_loans = pallet_pool_fees::Pallet::<T>::portfolio_valuation(pool_id).value();
let nav_fees = pallet_pool_fees::Pallet::<T>::update_portfolio_valuation_for_pool(
pool_id,
&mut pool.reserve.total,
)?;
)
.map(|(nav_fees, _)| nav_fees)
.unwrap_or(prev_fees_loans);

let nav = Nav::new(nav_loans, nav_fees);
let total = nav
.total(pool.reserve.total)
Expand Down

0 comments on commit c63c370

Please sign in to comment.