Switch unlesses to whens

IntersectMBO · Jan 12, 2024 · 7ca4c63 · 7ca4c63
1 parent afc341c
commit 7ca4c63
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/HeaderValidation.hs b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/HeaderValidation.hs
@@ -11,7 +11,7 @@ module Ouroboros.Consensus.Byron.Ledger.HeaderValidation (
   ) where
 
 import qualified Cardano.Chain.Slotting as CC
-import           Control.Monad (unless, when)
+import           Control.Monad (when)
 import           Control.Monad.Except (throwError)
 import qualified Data.Map.Strict as Map
 import           Data.Word
@@ -62,9 +62,9 @@ instance ValidateEnvelope ByronBlock where
   additionalEnvelopeChecks cfg _ledgerView hdr = do
       when (fromIsEBB newIsEBB && not (canBeEBB actualSlotNo)) $
         throwError $ UnexpectedEBBInSlot actualSlotNo
-      unless (fromIsEBB newIsEBB) $ -- TODO fine to ignore EBBs?
+      when (not (fromIsEBB newIsEBB)) $ -- TODO fine to ignore EBBs?
         whenJust (Map.lookup (blockNo hdr) checkpoints) $ \checkpoint ->
-          unless (checkpoint == blockHash hdr) $
+          when (checkpoint /= blockHash hdr) $
             throwError InvalidCheckpoint
     where
       actualSlotNo :: SlotNo

diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Protocol/Praos.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Protocol/Praos.hs
@@ -18,7 +18,7 @@ import           Cardano.Ledger.Slot (SlotNo (unSlotNo))
 import           Cardano.Protocol.TPraos.OCert
                      (OCert (ocertKESPeriod, ocertVkHot))
 import qualified Cardano.Protocol.TPraos.OCert as SL
-import           Control.Monad (unless)
+import           Control.Monad (unless, when)
 import           Control.Monad.Except (throwError)
 import           Data.Either (isRight)
 import qualified Data.Map.Strict as Map
@@ -74,7 +74,7 @@ instance PraosCrypto c => ProtocolHeaderSupportsEnvelope (Praos c) where
       throwError $
         BlockSizeTooLarge (bhviewBSize bhv) maxBodySize
     whenJust (Map.lookup (pHeaderBlock hdr) checkpoints) $ \checkpoint ->
-      unless (checkpoint == pHeaderHash hdr) $
+      when (checkpoint /= pHeaderHash hdr) $
         throwError InvalidCheckpoint
     where
       pp = praosParams cfg

diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Protocol/TPraos.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Protocol/TPraos.hs
@@ -19,7 +19,7 @@ import qualified Cardano.Protocol.TPraos.BHeader as SL
 import           Cardano.Protocol.TPraos.OCert (ocertKESPeriod, ocertVkHot)
 import qualified Cardano.Protocol.TPraos.OCert as SL
 import           Cardano.Slotting.Slot (unSlotNo)
-import           Control.Monad (unless)
+import           Control.Monad (when)
 import           Control.Monad.Except (liftEither, throwError)
 import           Data.Bifunctor (first)
 import           Data.Either (isRight)
@@ -69,7 +69,7 @@ instance PraosCrypto c => ProtocolHeaderSupportsEnvelope (TPraos c) where
         (SL.lvChainChecks lv)
         (SL.makeHeaderView $ protocolHeaderView @(TPraos c) hdr)
     whenJust (Map.lookup (pHeaderBlock hdr) checkpoints) $ \checkpoint ->
-      unless (checkpoint == pHeaderHash hdr) $
+      when (checkpoint /= pHeaderHash hdr) $
         throwError InvalidCheckpoint
     where
       MaxMajorProtVer maxPV = tpraosMaxMajorPV $ tpraosParams cfg