Ocean model weightage as u32

Author: Jouzo

lib/ain-dftx/src/types/oracles.rs

@@ -4,6 +4,7 @@ use bitcoin::{hash_types::Txid, io, ScriptBuf};
 use super::{
     common::CompactVec,
     price::{CurrencyPair, TokenPrice},
+    Weightage,
 };
 
 #[derive(ConsensusEncoding, Debug, PartialEq, Eq)]
@@ -21,14 +22,14 @@ pub struct RemoveOracle {
 #[derive(ConsensusEncoding, Debug, PartialEq, Eq)]
 pub struct AppointOracle {
     pub script: ScriptBuf,
-    pub weightage: u8,
+    pub weightage: Weightage,
     pub price_feeds: CompactVec<CurrencyPair>,
 }
 
 #[derive(ConsensusEncoding, Debug, PartialEq, Eq)]
 pub struct UpdateOracle {
     pub oracle_id: Txid,
     pub script: ScriptBuf,
-    pub weightage: u8,
+    pub weightage: Weightage,
     pub price_feeds: CompactVec<CurrencyPair>,
 }

lib/ain-ocean/src/api/prices.rs

@@ -46,7 +46,7 @@ pub struct OraclePriceAggregatedResponse {
 #[serde(rename_all = "camelCase")]
 pub struct OraclePriceAggregatedAggregatedResponse {
     pub amount: String,
-    pub weightage: Weightage,
+    pub weightage: u32,
     pub oracles: OraclePriceActiveNextOracles,
 }
 

lib/ain-ocean/src/indexer/oracle.rs

@@ -402,7 +402,7 @@ fn map_price_aggregated(
 
     let mut aggregated_total = Decimal::zero();
     let mut aggregated_count = 0;
-    let mut aggregated_weightage = 0u8;
+    let mut aggregated_weightage = 0u32;
 
     let oracles_len = oracles.len();
     for oracle in oracles {
@@ -424,12 +424,7 @@ fn map_price_aggregated(
         let time_diff = Decimal::from(feed.time) - Decimal::from(context.block.time);
         if Decimal::abs(&time_diff) < dec!(3600) {
             aggregated_count += 1;
-            aggregated_weightage =
-                aggregated_weightage
-                    .checked_add(oracle.weightage)
-                    .context(OtherSnafu {
-                        msg: "Error adding oracle weightage",
-                    })?;
+            aggregated_weightage += oracle.weightage as u32;
             log::trace!(
                 "SetOracleData weightage: {:?} * oracle_price.amount: {:?}",
                 aggregated_weightage,
@@ -785,8 +780,8 @@ pub fn invalidate_oracle_interval(
         aggregated: OraclePriceAggregatedIntervalAggregated {
             amount: aggregated_amount.to_string(),
             weightage: aggregated_weightage
-                .to_u8()
-                .context(ToPrimitiveSnafu { msg: "to_u8" })?,
+                .to_u32()
+                .context(ToPrimitiveSnafu { msg: "to_u32" })?,
             count,
             oracles: OraclePriceAggregatedIntervalAggregatedOracles {
                 active: aggregated_active
@@ -847,8 +842,8 @@ fn forward_aggregate(
         aggregated: OraclePriceAggregatedIntervalAggregated {
             amount: aggregated_amount.to_string(),
             weightage: aggregated_weightage
-                .to_u8()
-                .context(ToPrimitiveSnafu { msg: "to_u8" })?,
+                .to_u32()
+                .context(ToPrimitiveSnafu { msg: "to_u32" })?,
             count,
             oracles: OraclePriceAggregatedIntervalAggregatedOracles {
                 active: aggregated_active

lib/ain-ocean/src/model/oracle_price_active.rs

@@ -1,4 +1,3 @@
-use ain_dftx::Weightage;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 
@@ -23,7 +22,7 @@ pub struct OraclePriceActive {
 pub struct OraclePriceActiveNext {
     #[serde(with = "rust_decimal::serde::str")]
     pub amount: Decimal,
-    pub weightage: Weightage,
+    pub weightage: u32,
     pub oracles: OraclePriceActiveNextOracles,
 }
 

lib/ain-ocean/src/model/oracle_price_aggregated_interval.rs

@@ -1,4 +1,4 @@
-use ain_dftx::{Currency, Token, Weightage};
+use ain_dftx::{Currency, Token};
 use serde::{Deserialize, Serialize};
 
 use super::BlockContext;
@@ -32,7 +32,7 @@ pub struct OraclePriceAggregatedInterval {
 #[serde(rename_all = "camelCase")]
 pub struct OraclePriceAggregatedIntervalAggregated {
     pub amount: String,
-    pub weightage: Weightage,
+    pub weightage: u32,
     pub count: i32,
     pub oracles: OraclePriceAggregatedIntervalAggregatedOracles,
 }