Introduce a requestedAmount field to NotEnoughFunds to observe errors…

… better

- When returning funds use queryUTxOFor instead of queryMarkedUTxo

hydra-cluster/src/Hydra/Cluster/Faucet.hs

@@ -37,7 +37,7 @@ import Hydra.Ledger.Cardano ()
 data Marked = Fuel | Normal
 
 data FaucetException
-  = NotEnoughFunds {utxo :: UTxO}
+  = NotEnoughFunds {utxos :: UTxO, requestedAmount :: Lovelace}
   | FailedToBuildTx {reason :: TxBodyErrorAutoBalance}
   deriving (Show)
 
@@ -144,10 +144,10 @@ retryOnExceptions tracer action =
 -- We expect proper utxo to have more 'Lovelace' than the @lovelace@ argument
 findUTxO :: RunningNode -> Lovelace -> VerificationKey PaymentKey -> IO UTxO
 findUTxO RunningNode{networkId, nodeSocket} lovelace faucetVk = do
-  utxo <- queryUTxO networkId nodeSocket QueryTip [buildAddress faucetVk networkId]
-  let foundUTxO = UTxO.filter (\o -> txOutLovelace o >= lovelace) utxo
+  utxos <- queryUTxO networkId nodeSocket QueryTip [buildAddress faucetVk networkId]
+  let foundUTxO = UTxO.filter (\o -> txOutLovelace o >= lovelace) utxos
   when (null foundUTxO) $
-    throwIO $ NotEnoughFunds{utxo}
+    throwIO $ NotEnoughFunds{utxos, requestedAmount = lovelace}
   pure foundUTxO
 
 -- | Like 'seedFromFaucet', but without returning the seeded 'UTxO'.

hydra-cluster/src/Hydra/Cluster/Scenarios.hs

@@ -5,7 +5,7 @@ module Hydra.Cluster.Scenarios where
 
 import Hydra.Prelude
 
-import CardanoClient (queryTip)
+import CardanoClient (QueryPoint (..), queryTip, queryUTxOFor)
 import CardanoNode (RunningNode (..))
 import Control.Lens ((^?))
 import Data.Aeson (Value, object, (.=))
@@ -205,11 +205,11 @@ returnAssetsToFaucet ::
   RunningNode ->
   Actor ->
   IO ()
-returnAssetsToFaucet tracer node sender = do
+returnAssetsToFaucet tracer node@RunningNode{networkId, nodeSocket} sender = do
   (receivingVk, _) <- keysFor Faucet
   (senderVk, senderSk) <- keysFor sender
-  (fuelUTxO, otherUTxO) <- queryMarkedUTxO node senderVk
-  let returnBalance = selectLovelace $ balance @Tx (otherUTxO <> fuelUTxO)
+  utxo <- queryUTxOFor networkId nodeSocket QueryTip senderVk
+  let returnBalance = selectLovelace $ balance @Tx utxo
   void $ sendFundsTo node (senderVk, senderSk) receivingVk returnBalance Normal (contramap FromFaucet tracer)
   traceWith tracer $ ReturningToFaucet{actor = actorName sender, returnAmount = returnBalance}