From d7f369929480fad953fcc849ef88c04f68e69fca Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Wed, 8 Jul 2020 03:31:12 +0000 Subject: [PATCH] Simplify `determinePoolRegistrationStatus` pattern matching. In response to review feedback: https://github.com/input-output-hk/cardano-wallet/pull/1847#discussion_r451247533 --- lib/core/src/Cardano/Pool/DB.hs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/core/src/Cardano/Pool/DB.hs b/lib/core/src/Cardano/Pool/DB.hs index 10f893b2b1a..9fb7941cc91 100644 --- a/lib/core/src/Cardano/Pool/DB.hs +++ b/lib/core/src/Cardano/Pool/DB.hs @@ -224,23 +224,19 @@ determinePoolRegistrationStatus => Maybe (certificatePublicationTime, PoolRegistrationCertificate) -> Maybe (certificatePublicationTime, PoolRetirementCertificate) -> PoolRegistrationStatus -determinePoolRegistrationStatus = f - where - f Nothing _ = +determinePoolRegistrationStatus mReg mRet = case (mReg, mRet) of + (Nothing, _) -> PoolNotRegistered - f (Just (_, regCert)) Nothing = + (Just (_, regCert), Nothing) -> PoolRegistered regCert - f (Just reg) (Just ret) = - g reg ret - - g (regTime, regCert) (retTime, retCert) - | regPoolId /= retPoolId = + (Just (regTime, regCert), Just (retTime, retCert)) + | regPoolId /= retPoolId -> differentPoolsError - | regTime > retTime = + | regTime > retTime -> PoolRegistered regCert - | regTime < retTime = + | regTime < retTime -> PoolRegisteredAndRetired regCert retCert - | otherwise = + | otherwise -> timeCollisionError where regPoolId = view #poolId regCert