Specify the oldStatus in waitForTxOutStatusChangeTest

IntersectMBO · Jul 6, 2022 · 5f3cedc · 5f3cedc
1 parent 74ca796
commit 5f3cedc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/plutus-pab-executables/test/full/Plutus/PAB/CoreSpec.hs b/plutus-pab-executables/test/full/Plutus/PAB/CoreSpec.hs
@@ -262,7 +262,8 @@ waitForTxOutStatusChangeTest = runScenario $ do
     void $ Simulator.payToPaymentPublicKeyHash w1 pk1 (Ada.toValue Ledger.minAdaTxOut)
     Simulator.waitNSlots 1
 
-  txOutStatus1'' <- Simulator.waitForTxOutStatusChange txOutRef1
+  let oldStatus = (TentativelyConfirmed 8 TxValid (Spent $ getCardanoTxId tx2))
+  txOutStatus1'' <- Simulator.waitForTxOutStatusChange' oldStatus txOutRef1
   assertEqual "tx output 1 should be committed"
               (Committed TxValid (Spent $ getCardanoTxId tx2))
               txOutStatus1''

diff --git a/plutus-pab/src/Plutus/PAB/Core.hs b/plutus-pab/src/Plutus/PAB/Core.hs
@@ -58,6 +58,7 @@ module Plutus.PAB.Core
     , waitForState
     , waitForTxStatusChange
     , waitForTxOutStatusChange
+    , waitForTxOutStatusChange'
     , activeEndpoints
     , waitForEndpoint
     , yieldedExportTxs
@@ -520,6 +521,12 @@ waitForTxOutStatusChange t = do
     env <- asks @(PABEnvironment t env) blockchainEnv
     liftIO $ STM.atomically $ Instances.waitForTxOutStatusChange Unknown t env
 
+-- | Wait until the status of the transaction changes from the given status
+waitForTxOutStatusChange' :: forall t env. TxOutStatus -> TxOutRef -> PABAction t env TxOutStatus
+waitForTxOutStatusChange' oldStatus t = do
+    env <- asks @(PABEnvironment t env) blockchainEnv
+    liftIO $ STM.atomically $ Instances.waitForTxOutStatusChange oldStatus t env
+
 -- | The list of endpoints that are currently open
 activeEndpoints :: forall t env. ContractInstanceId -> PABAction t env (STM [OpenEndpoint])
 activeEndpoints instanceId = do

diff --git a/plutus-pab/src/Plutus/PAB/Simulator.hs b/plutus-pab/src/Plutus/PAB/Simulator.hs
@@ -50,6 +50,7 @@ module Plutus.PAB.Simulator(
     , waitForEndpoint
     , waitForTxStatusChange
     , waitForTxOutStatusChange
+    , waitForTxOutStatusChange'
     , currentSlot
     , waitUntilSlot
     , waitNSlots
@@ -405,6 +406,10 @@ waitForTxStatusChange = Core.waitForTxStatusChange
 waitForTxOutStatusChange :: forall t. TxOutRef -> Simulation t TxOutStatus
 waitForTxOutStatusChange = Core.waitForTxOutStatusChange
 
+-- | Wait until the status of the transaction changes from the given status
+waitForTxOutStatusChange' :: forall t. TxOutStatus -> TxOutRef -> Simulation t TxOutStatus
+waitForTxOutStatusChange' = Core.waitForTxOutStatusChange'
+
 -- | Wait until the endpoint becomes active.
 waitForEndpoint :: forall t. ContractInstanceId -> String -> Simulation t ()
 waitForEndpoint = Core.waitForEndpoint