chore: fix tests and add latest epochs

Author: fabianbormann

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

@@ -157,7 +157,12 @@ public static BigInteger calculateUnclaimedRefundsForRetiredPools(Set<RetiredPoo
                 !ownerAccountsRegisteredInThePast.contains(retiredPool.getRewardAddress())) {
           // If the reward address has been unregistered, the deposit can not be returned
           // and will be added to the treasury instead (Pool Reap see: shelley-ledger.pdf p.53)
-          unclaimedRefunds = unclaimedRefunds.add(retiredPool.getDepositAmount());
+          BigInteger depositAmount = BigInteger.valueOf(500_000_000); // default pool deposit of 500 Ada
+          if (retiredPool.getDepositAmount() != null) {
+            depositAmount = retiredPool.getDepositAmount();
+          }
+
+          unclaimedRefunds = unclaimedRefunds.add(depositAmount);
         }
       }
     }

validation/src/main/java/org/cardanofoundation/rewards/validation/TreasuryValidation.java

@@ -7,6 +7,8 @@
 import org.cardanofoundation.rewards.validation.data.provider.JsonDataProvider;
 import org.cardanofoundation.rewards.validation.domain.EpochValidationInput;
 import org.cardanofoundation.rewards.validation.domain.TreasuryValidationResult;
+
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.HashSet;
 import java.util.List;
@@ -15,7 +17,8 @@
 
 public class TreasuryValidation {
 
-  public static TreasuryValidationResult calculateTreasuryForEpoch(int epoch, DataProvider dataProvider, NetworkConfig networkConfig) {
+  public static TreasuryValidationResult calculateTreasuryForEpoch(int epoch, DataProvider dataProvider, NetworkConfig networkConfig,
+                                                                   BigInteger unspendableEarnedRewards) {
     TreasuryCalculationResult treasuryCalculationResult;
 
     if (dataProvider instanceof JsonDataProvider) {
@@ -53,7 +56,7 @@ public static TreasuryValidationResult calculateTreasuryForEpoch(int epoch, Data
               epochValidationInput.getRetiredPools(),
               epochValidationInput.getMirCertificates().stream().toList(),
               epochValidationInput.getDeregisteredAccountsOnEpochBoundary(),
-              epochValidationInput.getRegisteredAccountsUntilNow(), BigInteger.ZERO, networkConfig);
+              epochValidationInput.getRegisteredAccountsUntilNow(), unspendableEarnedRewards, networkConfig);
     } else {
       AdaPots adaPotsForPreviousEpoch = dataProvider.getAdaPotsForEpoch(epoch - 1);
       ProtocolParameters protocolParameters = dataProvider.getProtocolParametersForEpoch(epoch - 2);

validation/src/test/java/org/cardanofoundation/rewards/validation/EpochValidationTest.java

@@ -108,7 +108,7 @@ public void testAllegraHardForkEpoch() {
     }
 
     static Stream<Integer> dataProviderEpochRange() {
-        return IntStream.range(206, 230).boxed();
+        return IntStream.range(210, 230).boxed();
     }
 
     @ParameterizedTest
@@ -126,7 +126,7 @@ public void testCalculateEpochRewardsWithJsonDataProvider(int epoch) {
 
     static Stream<Integer> testEpochs() {
         return Stream.of(
-                360, 475
+                360, 475, 537
         );
     }
 

validation/src/test/java/org/cardanofoundation/rewards/validation/TreasuryValidationTest.java

@@ -4,6 +4,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import lombok.extern.slf4j.Slf4j;
 import org.cardanofoundation.rewards.calculation.config.NetworkConfig;
 import org.cardanofoundation.rewards.validation.data.provider.DataProvider;
 import org.cardanofoundation.rewards.validation.data.provider.DbSyncDataProvider;
@@ -25,6 +26,7 @@
 @SpringBootTest
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @ComponentScan
+@Slf4j
 public class TreasuryValidationTest {
 
   @Autowired
@@ -59,13 +61,21 @@ void Test_calculateTreasury(final int epoch, DataProviderType dataProviderType)
       throw new RuntimeException("Unknown data provider type: " + dataProviderType);
     }
 
-    TreasuryValidationResult treasuryValidationResult = TreasuryValidation.calculateTreasuryForEpoch(epoch, dataProvider, networkConfig);
+    BigInteger unspendableEarnedRewards = BigInteger.ZERO;
+    if (epoch == 215) {
+      unspendableEarnedRewards = new BigInteger("53681623");
+    } else if (epoch > 215) {
+      log.warn("Unspendable rewards are not provided for epoch " + epoch + " and cannot be calculated within the TreasuryCalculation" +
+              " as it needs other variables processed in the EpochCalculation, using zero value, but the test may fail.");
+    }
+
+    TreasuryValidationResult treasuryValidationResult = TreasuryValidation.calculateTreasuryForEpoch(epoch, dataProvider, networkConfig, unspendableEarnedRewards);
     BigInteger difference = treasuryValidationResult.getActualTreasury().subtract(treasuryValidationResult.getCalculatedTreasury());
     Assertions.assertEquals(BigInteger.ZERO, difference, "The difference " + difference.longValue() + " Lovelace between expected treasury value and actual treasury value is not zero");
   }
 
   static Stream<Integer> dataProviderRange() {
-    return IntStream.range(209, 215).boxed();
+    return IntStream.range(210, 216).boxed();
   }
 
   @ParameterizedTest