Change signature of opwHasObject to use STM m instead of m

Author: tbagrel1

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ObjectDiffusion/Inbound.hs

@@ -287,7 +287,7 @@ objectDiffusionInbound tracer (maxFifoLength, maxNumIdsToReq, maxNumObjectsToReq
       -- objectIds that we already have in the pool and thus don't need to
       -- request.
       let st' = st{numIdsInFlight = numIdsInFlight st - numIdsRequested}
-      poolHasObject <- opwHasObject
+      poolHasObject <- atomically $ opwHasObject
       continueWithStateM
         (go n)
         (preAcknowledge st' poolHasObject collectedIds)

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ObjectDiffusion/ObjectPool/API.hs

@@ -19,10 +19,6 @@ data ObjectPoolReader objectId object ticketNo m
   -- than the specified one. The number of returned objects is capped by the
   -- given Word64. Only the IDs and ticketNos of the objects are directly
   -- accessible; each actual object must be loaded through a monadic action.
-  --
-  -- TODO: This signature assume that we have all the IDs and ticketNos in
-  -- memory, but not the actual objects. This might change if IDs must be loaded
-  -- from disk too.
   }
 
 -- | Interface used by the inbound side of object diffusion when receiving
@@ -33,6 +29,6 @@ data ObjectPoolWriter objectId object m
   -- ^ Return the id of the specified object
   , opwAddObjects :: [object] -> m ()
   -- ^ Add a batch of objects to the objectPool.
-  , opwHasObject :: m (objectId -> Bool)
+  , opwHasObject :: STM m (objectId -> Bool)
   -- ^ Check if the object pool contains an object with the given id
   }

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ObjectDiffusion/ObjectPool/PerasCert.hs

@@ -52,7 +52,7 @@ makePerasCertPoolWriterFromCertDB perasCertDB =
     , opwAddObjects =
         mapM_ $ PerasCertDB.addCert perasCertDB
     , opwHasObject = do
-        certSnapshot <- atomically $ PerasCertDB.getCertSnapshot perasCertDB
+        certSnapshot <- PerasCertDB.getCertSnapshot perasCertDB
         pure $ PerasCertDB.containsCert certSnapshot
     }
 
@@ -71,6 +71,6 @@ makePerasCertPoolWriterFromChainDB chainDB =
     , opwAddObjects =
         mapM_ $ ChainDB.addPerasCertAsync chainDB
     , opwHasObject = do
-        certSnapshot <- atomically $ ChainDB.getPerasCertSnapshot chainDB
+        certSnapshot <- ChainDB.getPerasCertSnapshot chainDB
         pure $ PerasCertDB.containsCert certSnapshot
     }

ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/ObjectDiffusion/Smoke.hs

@@ -139,7 +139,7 @@ makeObjectPoolWriter (SmokeObjectPool poolContentTvar) =
         atomically $ modifyTVar poolContentTvar (++ objects)
         return ()
     , opwHasObject = do
-        poolContent <- atomically $ readTVar poolContentTvar
+        poolContent <- readTVar poolContentTvar
         pure $ \objectId -> any (\obj -> getSmokeObjectId obj == objectId) poolContent
     }