Make delistPools replace the set of delisted pools.

We must replace the set of delisted pools, rather than augmenting it. In response to review feedback: #2277 (comment)
cardano-foundation · Oct 28, 2020 · b67c89f · b67c89f
1 parent 35e29f8
commit b67c89f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/core/src/Cardano/Pool/DB/Model.hs b/lib/core/src/Cardano/Pool/DB/Model.hs
@@ -432,7 +432,7 @@ mRollbackTo ti point = do
         | otherwise = Nothing
 
 mDelistPools :: [PoolId] -> ModelOp ()
-mDelistPools = modify #delisted . Set.union . Set.fromList
+mDelistPools = modify #delisted . const . Set.fromList
 
 mReadDelistedPools :: ModelOp [PoolId]
 mReadDelistedPools = Set.toList <$> get #delisted

diff --git a/lib/core/src/Cardano/Pool/DB/Sqlite.hs b/lib/core/src/Cardano/Pool/DB/Sqlite.hs
@@ -491,8 +491,9 @@ newDBLayer trace fp timeInterpreter = do
             deleteWhere [ BlockSlot >. point ]
             -- TODO: remove dangling metadata no longer attached to a pool
 
-        delistPools =
-            insertMany_ . fmap PoolDelistment
+        delistPools pools = do
+            deleteWhere ([] :: [Filter PoolDelistment])
+            insertMany_ $ fmap PoolDelistment pools
 
         readDelistedPools =
             fmap (delistedPoolId . entityVal) <$> selectList [] []