[ci]Fix in test for getTotalAmuletBalance returning Future[Option[T]]

Signed-off-by: Raymond Roestenburg <[email protected]>

Author: ray-roestenburg-da

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/ScanTimeBasedIntegrationTest.scala

@@ -364,11 +364,11 @@ class ScanTimeBasedIntegrationTest
       val total0 =
         sv1ScanBackend
           .getTotalAmuletBalance(firstRound + 0)
-          .valueOrFail("Amulet balance not yet computed")
+          .getOrElse(BigDecimal(0))
       val total1 =
         sv1ScanBackend
           .getTotalAmuletBalance(firstRound + 1)
-          .valueOrFail("Amulet balance not yet computed")
+          .getOrElse(BigDecimal(0))
       val total2 =
         sv1ScanBackend
           .getTotalAmuletBalance(firstRound + 2)

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/store/db/DbScanStore.scala

@@ -603,16 +603,19 @@ class DbScanStore(
             // which is why the first entry found <= asOfEndOfRound is used
             sql"""
               select greatest(
-                   0,
-                   sum_cumulative_change_to_initial_amount_as_of_round_zero -
-                   sum_cumulative_change_to_holding_fees_rate * ($asOfEndOfRound + 1)
-                 )
+                0,
+                coalesce(
+                  sum_cumulative_change_to_initial_amount_as_of_round_zero -
+                  sum_cumulative_change_to_holding_fees_rate * ($asOfEndOfRound + 1),
+                  0
+                )
+              )
               from    round_total_amulet_balance
               where   store_id = $roundTotalsStoreId
               and     closed_round <= $asOfEndOfRound
               order by closed_round desc
               limit 1;
-              """.as[Option[BigDecimal]].head,
+              """.as[BigDecimal].headOption,
             "getTotalAmuletBalance",
           )
         }

apps/scan/src/test/scala/org/lfdecentralizedtrust/splice/store/db/ScanStoreTest.scala

@@ -138,10 +138,11 @@ abstract class ScanStoreTest
           )
           _ <- store.aggregate()
         } yield {
-          store.getTotalAmuletBalance(1).futureValue shouldBe (0.0)
+          // nothing occurs before the mint so there is no total amulet balance
+          store.getTotalAmuletBalance(1).futureValue shouldBe empty
           // 100.0 is the initial amount as of round 0, so at the end of round 2 the holding fee was applied three times
-          store.getTotalAmuletBalance(2).futureValue shouldBe (amuletAmount - 3 * holdingFee)
-          store.getTotalAmuletBalance(3).futureValue shouldBe (amuletAmount - 4 * holdingFee)
+          store.getTotalAmuletBalance(2).futureValue.value shouldBe (amuletAmount - 3 * holdingFee)
+          store.getTotalAmuletBalance(3).futureValue.value shouldBe (amuletAmount - 4 * holdingFee)
         }
       }
 
@@ -179,13 +180,15 @@ abstract class ScanStoreTest
           )
           _ <- store.aggregate()
         } yield {
-          store.getTotalAmuletBalance(1).futureValue shouldBe (amuletRound1 - 1 * holdingFee)
+          store.getTotalAmuletBalance(1).futureValue.value shouldBe (amuletRound1 - 1 * holdingFee)
           store
             .getTotalAmuletBalance(2)
-            .futureValue shouldBe (amuletRound1 - 2 * holdingFee + changeToInitialAmountAsOfRoundZero - 3 * holdingFee)
+            .futureValue
+            .value shouldBe (amuletRound1 - 2 * holdingFee + changeToInitialAmountAsOfRoundZero - 3 * holdingFee)
           store
             .getTotalAmuletBalance(3)
-            .futureValue shouldBe (amuletRound1 - 3 * holdingFee + changeToInitialAmountAsOfRoundZero - 4 * holdingFee)
+            .futureValue
+            .value shouldBe (amuletRound1 - 3 * holdingFee + changeToInitialAmountAsOfRoundZero - 4 * holdingFee)
         }
       }
 
@@ -226,13 +229,15 @@ abstract class ScanStoreTest
           )
           _ <- store.aggregate()
         } yield {
-          store.getTotalAmuletBalance(1).futureValue shouldBe (amuletRound1 - 1 * holdingFee)
+          store.getTotalAmuletBalance(1).futureValue.value shouldBe (amuletRound1 - 1 * holdingFee)
           store
             .getTotalAmuletBalance(2)
-            .futureValue shouldBe (amuletRound1 - 2 * holdingFee + changeToInitialAmountAsOfRoundZero - 3 * holdingFee)
+            .futureValue
+            .value shouldBe (amuletRound1 - 2 * holdingFee + changeToInitialAmountAsOfRoundZero - 3 * holdingFee)
           store
             .getTotalAmuletBalance(3)
-            .futureValue shouldBe (amuletRound1 - 3 * holdingFee + changeToInitialAmountAsOfRoundZero - 4 * holdingFee)
+            .futureValue
+            .value shouldBe (amuletRound1 - 3 * holdingFee + changeToInitialAmountAsOfRoundZero - 4 * holdingFee)
         }
       }
 
@@ -253,10 +258,11 @@ abstract class ScanStoreTest
           )
           _ <- store.aggregate()
         } yield {
-          store.getTotalAmuletBalance(1).futureValue shouldBe (0.0)
+          // nothing occurs before the mint so there is no total amulet balance calculated
+          store.getTotalAmuletBalance(1).futureValue shouldBe empty
           // The amulet is minted at round 2, so at the end of that round it's already incurring 1 x holding fee
-          store.getTotalAmuletBalance(2).futureValue shouldBe (mintAmount - 1 * holdingFee)
-          store.getTotalAmuletBalance(3).futureValue shouldBe (mintAmount - 2 * holdingFee)
+          store.getTotalAmuletBalance(2).futureValue.value shouldBe (mintAmount - 1 * holdingFee)
+          store.getTotalAmuletBalance(3).futureValue.value shouldBe (mintAmount - 2 * holdingFee)
         }
       }