fmt

DeFiCh · Nov 19, 2024 · 259d1e4 · 259d1e4
1 parent d7e6bbd
commit 259d1e4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/lib/ain-ocean/src/api/prices.rs b/lib/ain-ocean/src/api/prices.rs
@@ -259,25 +259,21 @@ impl OraclePriceActiveResponse {
             id: format!("{}-{}-{}", token, currency, v.block.height),
             key: format!("{}-{}", token, currency),
             sort: hex::encode(v.block.height.to_be_bytes()).to_string(),
-            active: v.active.map(|active| {
-                OraclePriceActiveNextResponse {
-                    amount: format!("{:.8}", active.amount / Decimal::from(COIN)),
-                    weightage: active.weightage,
-                    oracles: OraclePriceActiveNextOraclesResponse {
-                        active: active.oracles.active.to_i32().unwrap_or_default(),
-                        total: active.oracles.total,
-                    }
-                }
+            active: v.active.map(|active| OraclePriceActiveNextResponse {
+                amount: format!("{:.8}", active.amount / Decimal::from(COIN)),
+                weightage: active.weightage,
+                oracles: OraclePriceActiveNextOraclesResponse {
+                    active: active.oracles.active.to_i32().unwrap_or_default(),
+                    total: active.oracles.total,
+                },
             }),
-            next: v.next.map(|next| {
-                OraclePriceActiveNextResponse {
-                    amount: format!("{:.8}", next.amount / Decimal::from(COIN)),
-                    weightage: next.weightage,
-                    oracles: OraclePriceActiveNextOraclesResponse {
-                        active: next.oracles.active.to_i32().unwrap_or_default(),
-                        total: next.oracles.total,
-                    }
-                }
+            next: v.next.map(|next| OraclePriceActiveNextResponse {
+                amount: format!("{:.8}", next.amount / Decimal::from(COIN)),
+                weightage: next.weightage,
+                oracles: OraclePriceActiveNextOraclesResponse {
+                    active: next.oracles.active.to_i32().unwrap_or_default(),
+                    total: next.oracles.total,
+                },
             }),
             is_live: v.is_live,
             block: v.block,

diff --git a/lib/ain-ocean/src/indexer/mod.rs b/lib/ain-ocean/src/indexer/mod.rs
@@ -17,9 +17,9 @@ use std::{
 use ain_dftx::{deserialize, is_skipped_tx, DfTx, Stack};
 use defichain_rpc::json::blockchain::{Block, Transaction, Vin, VinStandard, Vout};
 use helper::check_if_evm_tx;
+use loan_token::{index_active_price, invalidate_active_price};
 use log::trace;
 pub use poolswap::PoolSwapAggregatedInterval;
-use loan_token::{index_active_price, invalidate_active_price};
 use poolswap::{index_pool_swap_aggregated, invalidate_pool_swap_aggregated};
 
 use crate::{

diff --git a/lib/ain-ocean/src/indexer/oracle.rs b/lib/ain-ocean/src/indexer/oracle.rs
@@ -301,7 +301,10 @@ fn map_price_aggregated(
         let feed = services
             .oracle_price_feed
             .by_id
-            .list(Some((id.0, id.1, id.2, u32::MAX, base_id)), SortOrder::Descending)?
+            .list(
+                Some((id.0, id.1, id.2, u32::MAX, base_id)),
+                SortOrder::Descending,
+            )?
             .next()
             .transpose()?;
 
@@ -450,7 +453,12 @@ impl Index for SetOracleData {
         let feeds = map_price_feeds(self, context);
 
         for ((token, currency, _, _, _), _) in feeds.iter().rev() {
-            let id = (token.clone(), currency.clone(), context.block.median_time, context.block.height);
+            let id = (
+                token.clone(),
+                currency.clone(),
+                context.block.median_time,
+                context.block.height,
+            );
 
             let aggregated = oracle_repo.by_id.get(&id)?;
 

diff --git a/lib/ain-ocean/src/indexer/poolswap.rs b/lib/ain-ocean/src/indexer/poolswap.rs
@@ -226,7 +226,10 @@ pub fn index_pool_swap_aggregated(services: &Arc<Services>, block: &BlockContext
     Ok(())
 }
 
-pub fn invalidate_pool_swap_aggregated(services: &Arc<Services>, block: &BlockContext) -> Result<()> {
+pub fn invalidate_pool_swap_aggregated(
+    services: &Arc<Services>,
+    block: &BlockContext,
+) -> Result<()> {
     let mut pool_pairs = ain_cpp_imports::get_pool_pairs();
     pool_pairs.sort_by(|a, b| b.creation_height.cmp(&a.creation_height));