Rename isTxAdded and isTxRejected functions

Author: intricate

ouroboros-consensus/src/Ouroboros/Consensus/Mempool/API.hs

@@ -17,8 +17,8 @@ module Ouroboros.Consensus.Mempool.API (
   , HasTxId(..)
   , GenTxId
   , MempoolAddTxResult (..)
-  , isTxAdded
-  , isTxRejected
+  , isMempoolTxAdded
+  , isMempoolTxRejected
   , MempoolSize (..)
   , TraceEventMempool(..)
   , HasTxs(..)
@@ -242,13 +242,13 @@ data MempoolAddTxResult blk
 deriving instance Eq (ApplyTxErr blk) => Eq (MempoolAddTxResult blk)
 deriving instance Show (ApplyTxErr blk) => Show (MempoolAddTxResult blk)
 
-isTxAdded :: MempoolAddTxResult blk -> Bool
-isTxAdded MempoolTxAdded = True
-isTxAdded _              = False
+isMempoolTxAdded :: MempoolAddTxResult blk -> Bool
+isMempoolTxAdded MempoolTxAdded = True
+isMempoolTxAdded _              = False
 
-isTxRejected :: MempoolAddTxResult blk -> Bool
-isTxRejected (MempoolTxRejected _) = True
-isTxRejected _                     = False
+isMempoolTxRejected :: MempoolAddTxResult blk -> Bool
+isMempoolTxRejected (MempoolTxRejected _) = True
+isMempoolTxRejected _                     = False
 
 -- | Wrapper around 'implTryAddTxs' that blocks until all transaction have
 -- either been added to the Mempool or rejected.

ouroboros-consensus/src/Ouroboros/Consensus/NodeKernel.hs

@@ -630,6 +630,6 @@ getMempoolWriter
 getMempoolWriter mempool = Inbound.TxSubmissionMempoolWriter
     { Inbound.txId          = txId
     , mempoolAddTxs = \txs ->
-        map (txId . fst) . filter (isTxAdded . snd) <$>
+        map (txId . fst) . filter (isMempoolTxAdded . snd) <$>
         addTxs mempool txs
     }

ouroboros-consensus/test-consensus/Test/Consensus/Mempool.hs

@@ -114,8 +114,8 @@ prop_Mempool_addTxs_result setup =
     withTestMempool (testSetup setup) $ \TestMempool { mempool } -> do
       result <- addTxs mempool (allTxs setup)
       return $ counterexample (ppTxs (txs setup)) $
-        [(tx, isTxAdded res) | (tx, res) <- result] ===
-        [(testTx, valid)     | (testTx, valid) <- txs setup]
+        [(tx, isMempoolTxAdded res) | (tx, res) <- result] ===
+        [(testTx, valid)            | (testTx, valid) <- txs setup]
 
 -- | Test that invalid transactions are never added to the 'Mempool'.
 prop_Mempool_InvalidTxsNeverAdded :: TestSetupWithTxs -> Property
@@ -186,13 +186,13 @@ prop_Mempool_Capacity (MempoolCapTestSetup testSetupWithTxs) =
     MempoolCapacityBytes capacity = testMempoolCap testSetup
 
     -- | Convert 'MempoolAddTxResult' into a 'Bool':
-    -- isTxAdded -> True, isTxRejected -> False.
+    -- isMempoolTxAdded -> True, isMempoolTxRejected -> False.
     blindErrors
       :: ([(GenTx TestBlock, MempoolAddTxResult blk)], [GenTx TestBlock])
       -> ([(GenTx TestBlock, Bool)], [GenTx TestBlock])
     blindErrors (processed, toAdd) = (processed', toAdd)
       where
-        processed' = [ (tx, isTxAdded txAddRes)
+        processed' = [ (tx, isMempoolTxAdded txAddRes)
                      | (tx, txAddRes) <- processed ]
 
     expectedResult
@@ -670,8 +670,8 @@ withTestMempool setup@TestSetup { testLedgerState, testInitialTxs, testMempoolCa
       result  <- addTxs mempool testInitialTxs
       -- the invalid transactions are reported in the same order they were
       -- added, so the first error is not the result of a cascade
-      whenJust (find (isTxRejected . snd) result) $ \(invalidTx, _) -> error $
-        "Invalid initial transaction: " <> condense invalidTx
+      whenJust (find (isMempoolTxRejected . snd) result) $ \(invalidTx, _) ->
+        error $ "Invalid initial transaction: " <> condense invalidTx
 
       -- Clear the trace
       atomically $ writeTVar varEvents []