From 0c89a5415f9a7f751460891900de1d4079584413 Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Fri, 11 Sep 2020 05:27:05 +0000 Subject: [PATCH] Make `mListRetiredPools` into a `ModelPoolOp`. --- lib/core/src/Cardano/Pool/DB/MVar.hs | 4 ++-- lib/core/src/Cardano/Pool/DB/Model.hs | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/core/src/Cardano/Pool/DB/MVar.hs b/lib/core/src/Cardano/Pool/DB/MVar.hs index 21578c71d99..d606fe36483 100644 --- a/lib/core/src/Cardano/Pool/DB/MVar.hs +++ b/lib/core/src/Cardano/Pool/DB/MVar.hs @@ -122,8 +122,8 @@ newDBLayer timeInterpreter = do listRegisteredPools = readPoolDB db mListRegisteredPools - listRetiredPools epochNo = - modifyMVar db (pure . swap . mListRetiredPools epochNo) + listRetiredPools = + readPoolDB db . mListRetiredPools listPoolLifeCycleData = readPoolDB db . mListPoolLifeCycleData diff --git a/lib/core/src/Cardano/Pool/DB/Model.hs b/lib/core/src/Cardano/Pool/DB/Model.hs index 273fd4a2c00..a2ef38a2531 100644 --- a/lib/core/src/Cardano/Pool/DB/Model.hs +++ b/lib/core/src/Cardano/Pool/DB/Model.hs @@ -281,11 +281,8 @@ listRegisteredPools :: PoolDatabase -> [PoolId] listRegisteredPools PoolDatabase {registrations} = snd <$> Map.keys registrations -mListRetiredPools - :: EpochNo - -> PoolDatabase - -> ([PoolRetirementCertificate], PoolDatabase) -mListRetiredPools epochNo db = (listRetiredPools epochNo db, db) +mListRetiredPools :: EpochNo -> ModelPoolOp [PoolRetirementCertificate] +mListRetiredPools epochNo db = (pure $ listRetiredPools epochNo db, db) listRetiredPools :: EpochNo -> PoolDatabase -> [PoolRetirementCertificate] listRetiredPools epochNo db = retiredPools