Merge #1780

1780: Use MD5 instead of ShortHash in Mempool tests r=nfrisby a=nfrisby Closes #1779. I also included some of the additions that we needed in order to debug the original hash collision. Co-authored-by: Nicolas Frisby <[email protected]>
IntersectMBO · Mar 10, 2020 · cca25ad · cca25ad
2 parents 049cc6a + 8eecd3c
commit cca25ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/ouroboros-consensus/ouroboros-consensus-mock/src/Ouroboros/Consensus/Mock/Ledger/UTxO.hs b/ouroboros-consensus/ouroboros-consensus-mock/src/Ouroboros/Consensus/Mock/Ledger/UTxO.hs
@@ -69,7 +69,7 @@ instance Condense Tx where
 
 type Ix     = Word
 type Amount = Word
-type TxId   = Hash ShortHash Tx
+type TxId   = Hash MD5 Tx
 type TxIn   = (TxId, Ix)
 type TxOut  = (Addr, Amount)
 type Utxo   = Map TxIn TxOut

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Mempool/API.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Mempool/API.hs
@@ -239,6 +239,9 @@ data MempoolAddTxResult blk
     -- ^ The transaction was rejected and could not be added to the mempool
     -- for the specified reason.
 
+deriving instance Eq (ApplyTxErr blk) => Eq (MempoolAddTxResult blk)
+deriving instance Show (ApplyTxErr blk) => Show (MempoolAddTxResult blk)
+
 isTxAddedOrAlreadyInMempool :: MempoolAddTxResult blk -> Bool
 isTxAddedOrAlreadyInMempool MempoolTxAdded            = True
 isTxAddedOrAlreadyInMempool MempoolTxAlreadyInMempool = True

diff --git a/ouroboros-consensus/test-consensus/Test/Consensus/Mempool.hs b/ouroboros-consensus/test-consensus/Test/Consensus/Mempool.hs
@@ -318,11 +318,14 @@ ppTestSetup :: TestSetup -> String
 ppTestSetup TestSetup { testInitialTxs
                       , testMempoolCap = MempoolCapacityBytes mpCap
                       } = unlines $
-    ["Initial contents of the Mempool:"] <>
-    (map condense testInitialTxs)        <>
-    ["Mempool capacity:"]                <>
+    ["Initial contents of the Mempool:"]  <>
+    (map ppTestTxWithHash testInitialTxs) <>
+    ["Mempool capacity:"]                 <>
     [condense mpCap]
 
+ppTestTxWithHash :: TestTx -> String
+ppTestTxWithHash x = condense (hash (simpleGenTx x) :: Hash MD5 Tx, x)
+
 -- | Given some transactions, calculate the sum of their sizes in bytes.
 txSizesInBytes :: [TestTx] -> TxSizeInBytes
 txSizesInBytes = foldl' (\acc tx -> acc + txSize tx) 0
@@ -660,6 +663,8 @@ withTestMempool setup@TestSetup { testLedgerState, testInitialTxs, testMempoolCa
                                               testMempoolCap
                                               tracer
       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