refactor: make redelegations a single arg

Author: mateuszjasiuk

webserver/src/response/pos.rs

@@ -178,18 +178,28 @@ impl Bond {
     }
 }
 
+pub struct MergedBondRedelegation {
+    pub redelegation_end_epoch: i32,
+    pub chain_state: ChainCrawlerStateDb,
+    pub min_num_of_blocks: i32,
+    pub min_duration: i32,
+    pub slash_processing_epoch_offset: i32,
+}
+
 impl MergedBond {
     pub fn from(
         amount: BigDecimal,
         db_validator: ValidatorDb,
-        redelegation_end_epoch: Option<i32>,
-        chain_state: &ChainCrawlerStateDb,
-        min_num_of_blocks: i32,
-        min_duration: i32,
-        slash_processing_epoch_offset: i32,
+        redelegation: Option<MergedBondRedelegation>,
     ) -> Self {
-        match redelegation_end_epoch {
-            Some(redelegation_end_epoch) => {
+        match redelegation {
+            Some(MergedBondRedelegation {
+                redelegation_end_epoch,
+                chain_state,
+                min_num_of_blocks,
+                min_duration,
+                slash_processing_epoch_offset,
+            }) => {
                 let earliest_redelegation_epoch =
                     redelegation_end_epoch - 1 + slash_processing_epoch_offset;
 

webserver/src/service/pos.rs

@@ -8,7 +8,8 @@ use crate::error::pos::PoSError;
 use crate::repository::chain::{ChainRepository, ChainRepositoryTrait};
 use crate::repository::pos::{PosRepository, PosRepositoryTrait};
 use crate::response::pos::{
-    Bond, BondStatus, MergedBond, Reward, Unbond, ValidatorWithId, Withdraw,
+    Bond, BondStatus, MergedBond, MergedBondRedelegation, Reward, Unbond,
+    ValidatorWithId, Withdraw,
 };
 
 #[derive(Clone)]
@@ -153,14 +154,22 @@ impl PosService {
         let bonds: Vec<MergedBond> = db_bonds
             .into_iter()
             .map(|(_, validator, redelegation_end_epoch, amount)| {
+                let redelegation =
+                    redelegation_end_epoch.map(|redelegation_end_epoch| {
+                        MergedBondRedelegation {
+                            redelegation_end_epoch,
+                            chain_state: chain_state.clone(),
+                            min_num_of_blocks: parameters.min_num_of_blocks,
+                            min_duration: parameters.min_duration,
+                            slash_processing_epoch_offset: parameters
+                                .slash_processing_epoch_offset,
+                        }
+                    });
+
                 MergedBond::from(
                     amount.unwrap_or(BigDecimal::zero()),
                     validator,
-                    redelegation_end_epoch,
-                    &chain_state,
-                    parameters.min_num_of_blocks,
-                    parameters.min_duration,
-                    parameters.slash_processing_epoch_offset,
+                    redelegation,
                 )
             })
             .collect();