From 2141d7044960839bbc574cd04ec08c9ccabefed2 Mon Sep 17 00:00:00 2001 From: Sasha Bogicevic Date: Thu, 9 Mar 2023 09:58:28 +0100 Subject: [PATCH] Prepend the type of state to the error messages --- hydra-node/exe/hydra-node/Main.hs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/hydra-node/exe/hydra-node/Main.hs b/hydra-node/exe/hydra-node/Main.hs index f88ff83ed01..1d1dc6041ac 100644 --- a/hydra-node/exe/hydra-node/Main.hs +++ b/hydra-node/exe/hydra-node/Main.hs @@ -131,16 +131,19 @@ main = do checkParamsAgainstExistingState hs env = case hs of Idle _ -> [] - Initial InitialState{parameters} -> "InitialState: " : validateParameters parameters - Open OpenState{parameters} -> "OpenState: " : validateParameters parameters - Closed ClosedState{parameters} -> "ClosedState: " : validateParameters parameters + Initial InitialState{parameters} -> validateParameters "InitialState: " parameters + Open OpenState{parameters} -> validateParameters "OpenState: " parameters + Closed ClosedState{parameters} -> validateParameters "ClosedState: " parameters where - validateParameters params = - flip execState [] $ do - when (Hydra.Chain.contestationPeriod params /= cp) $ - modify (\s -> s <> ["Contestation period does not match. "]) - when (Hydra.Chain.parties params /= envParties) $ - modify (\s -> s <> ["Parties mismatch. "]) + validateParameters st params = + let res = flip execState [] $ do + when (Hydra.Chain.contestationPeriod params /= cp) $ + modify (\s -> s <> ["Contestation period does not match. "]) + when (Hydra.Chain.parties params /= envParties) $ + modify (\s -> s <> ["Parties mismatch. "]) + in case res of + [] -> [] + items -> st : items Environment{contestationPeriod = cp, otherParties, party} = env envParties = party : otherParties