.

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>

Author: cocreature

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

@@ -4,6 +4,7 @@ import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.IntegrationTest
 import org.lfdecentralizedtrust.splice.util.{SpliceUtil, TimeTestUtil, WalletTestUtil}
 import org.lfdecentralizedtrust.splice.validator.automation.ReceiveFaucetCouponTrigger
+import org.lfdecentralizedtrust.splice.codegen.java.splice.amulet.{AppRewardCoupon, ValidatorRewardCoupon}
 
 import scala.concurrent.duration.DurationInt
 
@@ -21,22 +22,39 @@ class WalletRewardsTimeBasedIntegrationTest
   // TODO (#965) remove and fix test failures
   override def walletAmuletPrice = SpliceUtil.damlDecimal(1.0)
 
+  override protected lazy val sanityChecksIgnoredRootCreates = Seq(
+    AppRewardCoupon.TEMPLATE_ID_WITH_PACKAGE_ID,
+    ValidatorRewardCoupon.TEMPLATE_ID_WITH_PACKAGE_ID
+  )
+
   "A wallet" should {
 
     "list and automatically collect app & validator rewards" in { implicit env =>
       val (alice, bob) = onboardAliceAndBob()
       waitForWalletUser(aliceValidatorWalletClient)
       waitForWalletUser(bobValidatorWalletClient)
+      val aliceValidatorParty = aliceValidatorBackend.getValidatorPartyId()
+      val bobValidatorParty = bobValidatorBackend.getValidatorPartyId()
 
       // Tap amulet and do a transfer from alice to bob
       aliceWalletClient.tap(walletAmuletToUsd(50))
 
       p2pTransfer(aliceWalletClient, bobWalletClient, bob, 40.0)
+      // Rewards roughly match what we had before we set fees to zero
+      createRewards(
+        appRewards = Seq((aliceValidatorParty, 0.43, false)),
+        validatorRewards = Seq((alice, 0.43))
+      )
 
       // Retrieve transferred amulet in bob's wallet and transfer part of it back to alice;
       // bob's validator will receive some app rewards
       eventually()(bobWalletClient.list().amulets should have size 1)
       p2pTransfer(bobWalletClient, aliceWalletClient, alice, 30.0)
+      // Rewards roughly match what we had before we set fees to zero
+      createRewards(
+        appRewards = Seq((bobValidatorParty, 0.33, false)),
+        validatorRewards = Seq((bob, 0.33))
+      )
 
       val openRounds = eventually() {
         import math.Ordering.Implicits.*

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

@@ -1,6 +1,5 @@
 package org.lfdecentralizedtrust.splice.integration.tests
 
-import org.lfdecentralizedtrust.splice.codegen.java.splice.amulet as amuletCodegen
 import org.lfdecentralizedtrust.splice.config.ConfigTransforms.{
   ConfigurableApp,
   updateAutomationConfig,
@@ -209,78 +208,6 @@ class WalletTimeBasedIntegrationTest
         }
       }
     }
-
-    "generate rewards for subscriptions" in { implicit env =>
-      onboardWalletUser(aliceWalletClient, aliceValidatorBackend)
-
-      clue(
-        "Advance seven rounds to ensure that rewards from previous test cases were claimed or expired"
-      ) {
-        Range(1, 8).foreach(_ => advanceRoundsToNextRoundOpening)
-      }
-
-      val respond = clue("Alice requests an ANS entry") {
-        aliceAnsExternalClient.createAnsEntry(
-          testEntryName,
-          testEntryUrl,
-          testEntryDescription,
-        )
-      }
-      bracket(
-        clue("Alice obtains some amulets and accepts the subscription") {
-          aliceWalletClient.tap(50.0)
-          aliceWalletClient.acceptSubscriptionRequest(respond.subscriptionRequestCid)
-        },
-        cancelAllSubscriptions(aliceWalletClient),
-      ) {
-        clue("Getting Alice's new entry") {
-          eventuallySucceeds() {
-            sv1ScanBackend.lookupEntryByName(testEntryName)
-          }
-        }
-
-        clue("Wait for reward coupons to be issued") {
-          eventually()({
-            aliceValidatorWalletClient.listAppRewardCoupons() should have length 1
-            aliceValidatorWalletClient.listValidatorRewardCoupons() should have length 2
-            sv1Backend.participantClient.ledger_api_extensions.acs
-              .filterJava(amuletCodegen.AppRewardCoupon.COMPANION)(
-                dsoParty,
-                _.data.provider == dsoParty.toProtoPrimitive,
-              ) should have length 1
-          })
-        }
-
-        actAndCheck(
-          "Advance six rounds - all rewards should be claimed or expired",
-          Range(1, 7).foreach(_ => advanceRoundsToNextRoundOpening),
-        )(
-          "",
-          _ => {
-            aliceValidatorWalletClient.listAppRewardCoupons() should be(empty)
-            aliceValidatorWalletClient.listValidatorRewardCoupons() should be(empty)
-            sv1Backend.participantClient.ledger_api_extensions.acs
-              .filterJava(amuletCodegen.AppRewardCoupon.COMPANION)(
-                dsoParty,
-                _.data.provider == dsoParty.toProtoPrimitive,
-              ) should be(empty)
-          },
-        )
-
-        actAndCheck(
-          "Advance time until ANS entry is up for renewal", {
-            // We time the advances so that automation doesn't trigger before payments can be made.
-            // TODO (#996): consider replacing with stopping and starting triggers
-            advanceTimeAndWaitForRoundAutomation(Duration.ofDays(89).minus(Duration.ofMinutes(17)))
-            advanceTimeToRoundOpen
-          },
-        )(
-          "Wait for another coupon to be generated upon renewal",
-          _ => aliceValidatorWalletClient.listAppRewardCoupons() should have length 1,
-        )
-      }
-    }
-
   }
 
 }