Skip to content

Commit 4b3c36b

Browse files
jonathanknowlesKtorZ
authored andcommitted
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)
1 parent cf7a5ad commit 4b3c36b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

lib/core/src/Cardano/Pool/DB/Model.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ mRollbackTo ti point = do
432432
| otherwise = Nothing
433433

434434
mDelistPools :: [PoolId] -> ModelOp ()
435-
mDelistPools = modify #delisted . Set.union . Set.fromList
435+
mDelistPools = modify #delisted . const . Set.fromList
436436

437437
mReadDelistedPools :: ModelOp [PoolId]
438438
mReadDelistedPools = Set.toList <$> get #delisted

lib/core/src/Cardano/Pool/DB/Sqlite.hs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,9 @@ newDBLayer trace fp timeInterpreter = do
491491
deleteWhere [ BlockSlot >. point ]
492492
-- TODO: remove dangling metadata no longer attached to a pool
493493

494-
delistPools =
495-
insertMany_ . fmap PoolDelistment
494+
delistPools pools = do
495+
deleteWhere ([] :: [Filter PoolDelistment])
496+
insertMany_ $ fmap PoolDelistment pools
496497

497498
readDelistedPools =
498499
fmap (delistedPoolId . entityVal) <$> selectList [] []

0 commit comments

Comments
 (0)