Merge pull request #63 from cardano-foundation/refactor/margin_type

Change pool margin type from Double to BigDecimal

Author: satran004

calculation/src/main/java/org/cardanofoundation/rewards/calculation/PoolRewardsCalculation.java

@@ -155,7 +155,7 @@ public static PoolRewardCalculationResult calculatePoolRewardInEpoch(final Strin
 
         final BigInteger poolStake = poolStateCurrentEpoch.getActiveStake();
         final BigInteger poolPledge = poolStateCurrentEpoch.getPledge();
-        final BigDecimal poolMargin = BigDecimal.valueOf(poolStateCurrentEpoch.getMargin());
+        final BigDecimal poolMargin = poolStateCurrentEpoch.getMargin();
         final BigInteger poolFixedCost = poolStateCurrentEpoch.getFixedCost();
         final int blocksPoolHasMinted = poolStateCurrentEpoch.getBlockCount();
 

calculation/src/main/java/org/cardanofoundation/rewards/calculation/domain/PoolRewardCalculationResult.java

@@ -25,7 +25,7 @@ public class PoolRewardCalculationResult {
     BigDecimal apparentPoolPerformance;
     BigInteger poolFee;
     BigInteger distributedPoolReward;
-    Double poolMargin;
+    BigDecimal poolMargin;
     BigInteger poolCost;
     Set<String> poolOwnerStakeAddresses;
     BigInteger unspendableEarnedRewards;

calculation/src/main/java/org/cardanofoundation/rewards/calculation/domain/PoolState.java

@@ -2,6 +2,7 @@
 
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.HashSet;
 
@@ -17,7 +18,7 @@ public class PoolState {
     private HashSet<String> owners;
     private BigInteger ownerActiveStake;
     private BigInteger poolFees;
-    private Double margin;
+    private BigDecimal margin;
     private BigInteger fixedCost;
     private BigInteger pledge;
     private HashSet<Delegator> delegators;

calculation/src/main/java/org/cardanofoundation/rewards/calculation/domain/PoolUpdate.java

@@ -2,6 +2,7 @@
 
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.HashSet;
 import java.util.List;
@@ -16,7 +17,7 @@ public class PoolUpdate {
     private String poolId;
     private Integer activeEpoch;
     private Integer retiringEpoch;
-    private Double margin;
+    private BigDecimal margin;
     private BigInteger fixedCost;
     private BigInteger pledge;
     private String rewardAddress;

validation/src/main/java/org/cardanofoundation/rewards/validation/entity/dbsync/DbSyncPoolUpdate.java

@@ -6,6 +6,7 @@
 import org.hibernate.annotations.Immutable;
 import org.springframework.context.annotation.Profile;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 
 @Entity
@@ -24,7 +25,7 @@ public class DbSyncPoolUpdate {
     private DbSyncPoolHash pool;
 
     private BigInteger pledge;
-    private Double margin;
+    private BigDecimal margin;
     @Column(name = "active_epoch_no")
     private Long activeEpochNumber;
 

validation/src/main/java/org/cardanofoundation/rewards/validation/entity/projection/LatestPoolUpdate.java

@@ -1,12 +1,13 @@
 package org.cardanofoundation.rewards.validation.entity.projection;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 
 public interface LatestPoolUpdate {
     Long getId();
     String getPoolId();
     BigInteger getPledge();
     BigInteger getFixedCost();
-    Double getMargin();
+    BigDecimal getMargin();
     String getRewardAddress();
 }

validation/src/main/java/org/cardanofoundation/rewards/validation/mapper/PoolHistoryMapper.java

@@ -2,6 +2,7 @@
 
 import org.cardanofoundation.rewards.calculation.domain.PoolState;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 
 public class PoolHistoryMapper {
@@ -12,7 +13,7 @@ public static PoolState fromKoiosPoolHistory(rest.koios.client.backend.api.pool.
         return PoolState.builder()
             .activeStake(new BigInteger(poolHistory.getActiveStake()))
             .poolFees(new BigInteger(poolHistory.getPoolFees()))
-            .margin(Double.parseDouble(String.valueOf(poolHistory.getMargin())))
+            .margin(new BigDecimal(String.valueOf(poolHistory.getMargin())))
             .fixedCost(new BigInteger(String.valueOf(poolHistory.getFixedCost())))
             .blockCount(poolHistory.getBlockCnt())
             .epoch(poolHistory.getEpochNo())

validation/src/test/java/org/cardanofoundation/rewards/validation/data/provider/DbSyncDataProviderTest.java

@@ -80,7 +80,7 @@ public void testGetPoolHistory() {
         Assertions.assertEquals(poolState.getActiveStake(), new BigInteger("27523186299296"));
         Assertions.assertEquals(poolState.getBlockCount(), 10);
         Assertions.assertEquals(poolState.getFixedCost(), new BigInteger("340000000"));
-        Assertions.assertEquals(poolState.getMargin(), 0.009);
+        Assertions.assertEquals(poolState.getMargin(), new BigDecimal("0.009"));
         Assertions.assertEquals(poolState.getPoolFees(), new BigInteger("475116283"));
     }