fix some tests

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

Author: cocreature

daml/splice-amulet/daml/Splice/AmuletRules.daml

@@ -1261,9 +1261,9 @@ data AppTransferContext = AppTransferContext
   deriving (Show, Eq)
 
 -- Adapter for choices that need to return an `AmuletCreateSummary` but call a choice internally that no longer returns one.
-legacyAmuletCreateSummary : Party -> ContractId OpenMiningRound -> ContractId Amulet -> Update (AmuletCreateSummary (ContractId Amulet))
-legacyAmuletCreateSummary dso miningRoundCid amulet = do
-  round <- fetchReferenceData (ForDso dso) miningRoundCid
+legacyAmuletCreateSummary : Party -> Party -> ContractId OpenMiningRound -> ContractId Amulet -> Update (AmuletCreateSummary (ContractId Amulet))
+legacyAmuletCreateSummary dso p miningRoundCid amulet = do
+  round <- fetchPublicReferenceData (ForDso dso) miningRoundCid (OpenMiningRound_Fetch p)
   pure AmuletCreateSummary with
     amulet
     amuletPrice = round.amuletPrice

daml/splice-wallet-payments/daml/Splice/Wallet/Payment.daml

@@ -234,7 +234,7 @@ template AcceptedAppPayment
       controller map (\r -> r.receiver) amuletReceiverAmounts
       do create TerminatedAppPayment with reference, sender, provider, receivers = map (\a -> a.receiver) amuletReceiverAmounts
          result <- exercise lockedAmulet LockedAmulet_UnlockV2
-         amuletSum <- legacyAmuletCreateSummary dso context.openMiningRound result.amuletCid
+         amuletSum <- legacyAmuletCreateSummary dso sender context.openMiningRound result.amuletCid
          return AcceptedAppPayment_RejectResult with
             amulet = amuletSum
 
@@ -245,6 +245,6 @@ template AcceptedAppPayment
       do -- TODO(#3152) Split out amulet unlocking from payment expiry
          create TerminatedAppPayment with reference, sender, provider, receivers = map (\a -> a.receiver) amuletReceiverAmounts
          result <- exercise lockedAmulet LockedAmulet_OwnerExpireLockV2
-         amuletSum <- legacyAmuletCreateSummary dso context.openMiningRound result.amuletCid
+         amuletSum <- legacyAmuletCreateSummary dso sender context.openMiningRound result.amuletCid
          return AcceptedAppPayment_ExpireResult with
             amulet = amuletSum

daml/splice-wallet-payments/daml/Splice/Wallet/Subscriptions.daml

@@ -216,7 +216,7 @@ template SubscriptionInitialPayment
       do
         _ <- create TerminatedSubscription with ..
         result <- exercise lockedAmulet LockedAmulet_UnlockV2
-        amuletSum <- legacyAmuletCreateSummary subscriptionData.dso transferContext.openMiningRound result.amuletCid
+        amuletSum <- legacyAmuletCreateSummary subscriptionData.dso subscriptionData.sender transferContext.openMiningRound result.amuletCid
         return SubscriptionInitialPayment_RejectResult with
           amuletSum
 
@@ -230,7 +230,7 @@ template SubscriptionInitialPayment
         require ("Actor " <> show actor <> " is a signatory") (actor `elem` signatory this)
         _ <- create TerminatedSubscription with ..
         result <- exercise lockedAmulet LockedAmulet_OwnerExpireLockV2 -- would fail if we can't expire yet
-        amuletSum <- legacyAmuletCreateSummary subscriptionData.dso transferContext.openMiningRound result.amuletCid
+        amuletSum <- legacyAmuletCreateSummary subscriptionData.dso subscriptionData.sender transferContext.openMiningRound result.amuletCid
         return SubscriptionInitialPayment_ExpireResult with
           amuletSum
 
@@ -336,7 +336,7 @@ template SubscriptionPayment
           nextPaymentDueAt = thisPaymentDueAt
           ..
         result <- exercise lockedAmulet LockedAmulet_UnlockV2
-        amuletSum <- legacyAmuletCreateSummary subscriptionData.dso transferContext.openMiningRound result.amuletCid
+        amuletSum <- legacyAmuletCreateSummary subscriptionData.dso subscriptionData.sender transferContext.openMiningRound result.amuletCid
         pure SubscriptionPayment_RejectResult with
           subscriptionState
           amuletSum
@@ -354,7 +354,7 @@ template SubscriptionPayment
           nextPaymentDueAt = thisPaymentDueAt
           ..
         result <- exercise lockedAmulet LockedAmulet_OwnerExpireLockV2 -- would fail if we can't expire yet
-        amuletSum <- legacyAmuletCreateSummary subscriptionData.dso transferContext.openMiningRound result.amuletCid
+        amuletSum <- legacyAmuletCreateSummary subscriptionData.dso subscriptionData.sender transferContext.openMiningRound result.amuletCid
         pure SubscriptionPayment_ExpireResult with
           subscriptionState
           amuletSum = amuletSum

daml/splice-wallet-test/daml/Splice/Scripts/Wallet/TestSubscriptions.daml

@@ -167,6 +167,7 @@ testUSDSubscription = script do
   let transferConfigAmulet = transferConfigAmuletFromOpenRound round
       expectedAppRewardInLockLeg = transferConfigAmulet.extraFeaturedAppRewardAmount
       expectedAppRewardInUnlockLeg = transferConfigAmulet.extraFeaturedAppRewardAmount
+  convertAllFeaturedAppActivityMarkers app.dso
   [(_, reward)] <- query @Splice.Amulet.AppRewardCoupon validator
   reward.amount === expectedAppRewardInLockLeg
   reward.featured === True
@@ -175,7 +176,6 @@ testUSDSubscription = script do
   (_subscriptionCid, subscriptionStateCid, _pizzeriasAmulet) <- collectInitialSubscriptionPayment app provider pizzeria alice.primaryParty initialPaymentCid
 
   convertAllFeaturedAppActivityMarkers app.dso
-
   [(_, reward)] <- query @Splice.Amulet.AppRewardCoupon provider.primaryParty
   reward.amount === expectedAppRewardInUnlockLeg
 
@@ -199,6 +199,7 @@ testUSDSubscription = script do
 
   payment2Cid <- makeSubscriptionPayment app alice validator None subscriptionStateCid
   (subscriptionState2Cid, _pizzeriasAmulet2) <- collectSubscriptionPayment app provider pizzeria alice.primaryParty payment2Cid
+  convertAllFeaturedAppActivityMarkers app.dso
 
   rewards <- query @Splice.Amulet.AppRewardCoupon validator
   let amounts = map (._2.amount) rewards