Resolve PR comments

Author: jorisdral

ouroboros-consensus-cardano/changelog.d/20230718_150203_joris_137_add_golden_txs_test_for_localTxSubmissionServer.md

@@ -0,0 +1,23 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Patch
+
+- A bullet item for the Patch category.
+
+-->
+### Non-Breaking
+
+- Add new `ProtocolInfo` module to `cardano-testlib`, containing utilities for
+  creating Cardano `ProtocolInfo`s for testing purposes.
+
+<!--
+### Breaking
+
+- A bullet item for the Breaking category.
+
+-->

ouroboros-consensus-cardano/src/cardano-testlib/Test/Consensus/Cardano/ProtocolInfo.hs

@@ -137,6 +137,8 @@ stayInByron =
 versionZero :: SL.Version
 versionZero = SL.natVersion @0
 
+-- TODO: could be simplified once we implement something like
+-- ouroboros-network#4115.
 hardForkInto :: Era -> HardForkSpec
 hardForkInto Byron   = stayInByron
 hardForkInto Shelley =
@@ -280,8 +282,6 @@ mkTestProtocolInfo
     protocolInfoCardano
         ProtocolParamsByron {
             byronGenesis                = genesisByron
-            -- Trivialize the PBFT signature window so that the forks induced by
-            -- the network partition are as deep as possible.
           , byronPbftSignatureThreshold = aByronPbftSignatureThreshold
           , byronProtocolVersion        = aByronProtocolVersion
           , byronSoftwareVersion        = softVerByron

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/MiniProtocol/LocalTxSubmission/ByteStringTxParser.hs

@@ -14,6 +14,7 @@ module Test.Consensus.Cardano.MiniProtocol.LocalTxSubmission.ByteStringTxParser
   ) where
 
 
+import           Cardano.Chain.Epoch.File (mainnetEpochSlots)
 import           Cardano.Chain.Slotting (EpochSlots (..))
 import           Codec.CBOR.Read (DeserialiseFailure, deserialiseFromBytes)
 import           Data.ByteString.Base16.Lazy (decodeLenient)
@@ -32,7 +33,7 @@ import           Text.Pretty.Simple (pPrint)
 cardanoCodecCfg :: CodecConfig (CardanoBlock StandardCrypto)
 cardanoCodecCfg =
   CardanoCodecConfig
-            (ByronCodecConfig (EpochSlots 21600))
+            (ByronCodecConfig mainnetEpochSlots)
             ShelleyCodecConfig
             ShelleyCodecConfig
             ShelleyCodecConfig
@@ -45,7 +46,13 @@ deserialiseTx ::
   -> Either DeserialiseFailure (BL.ByteString, GenTx (CardanoBlock StandardCrypto))
 deserialiseTx = deserialiseFromBytes cborDecoder . decodeLenient
   where
-    cborDecoder = decodeNodeToClient cardanoCodecCfg CardanoNodeToClientVersion11
+    cborDecoder = decodeNodeToClient cardanoCodecCfg latestReleasedBlockNodeToClientVersion
+    latestReleasedBlockNodeToClientVersion =
+        case latestReleasedNodeVersion p of
+          (_, Just n2c) -> supportedNodeToClientVersions p Map.! n2c
+          _             -> error "no latest released Cardano NodeToClient version"
+      where
+        p = Proxy @(CardanoBlock StandardCrypto)
 
 printDeserializedTx :: BL.ByteString -> IO ()
 printDeserializedTx bs =

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/MiniProtocol/LocalTxSubmission/Server.hs

@@ -71,13 +71,23 @@ tests =
 
           eraIndex @=? fromEnum era
 
-          mempool <- Mocked.openMockedMempool (Mempool.mkCapacityBytesOverride 100_000) -- We don't want the mempool to fill up during these tests.
-                                              nullTracer                                -- Use 'show >$< stdoutTracer' for debugging.
-                                              LedgerSupportsMempool.txInBlockSize
-                                              Mocked.MempoolAndModelParams {
-                                                  Mocked.immpInitialState = ledgerState $ pInfoInitLedger pInfo
-                                                , Mocked.immpLedgerConfig = topLevelConfigLedger $ pInfoConfig pInfo
-                                              }
+          let
+            -- We don't want the mempool to fill up during these tests.
+            capcityBytesOverride = Mempool.mkCapacityBytesOverride 100_000
+            -- Use 'show >$< stdoutTracer' for debugging.
+            tracer               = nullTracer
+            mempoolParams        = Mocked.MempoolAndModelParams {
+                Mocked.immpInitialState =
+                  ledgerState $ pInfoInitLedger pInfo
+              , Mocked.immpLedgerConfig =
+                  topLevelConfigLedger $ pInfoConfig pInfo
+              }
+
+          mempool <- Mocked.openMockedMempool
+                      capcityBytesOverride
+                      tracer
+                      LedgerSupportsMempool.txInBlockSize
+                      mempoolParams
 
           mempool `should_process` [ _137 ]
       where

ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/Cardano.hs

@@ -486,7 +486,10 @@ mkProtocolCardanoAndHardForkTxs
         initialNonce
         genesisByron
         generatedSecretsByron
-        (Just $ PBftSignatureThreshold 1) -- Trivialize the PBFT signature window so that the forks induced by the network partition are as deep as possible.
+        (Just $ PBftSignatureThreshold 1) -- Trivialize the PBFT signature
+                                          -- window so that the forks induced by
+                                          -- the network partition are as deep
+                                          -- as possible.
         HardForkSpec {
             shelleyHardForkSpec =
               ( SL.ProtVer shelleyMajorVersion 0

ouroboros-consensus/changelog.d/20230718_150039_joris_137_add_golden_txs_test_for_localTxSubmissionServer.md

@@ -0,0 +1,23 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Patch
+
+- A bullet item for the Patch category.
+
+-->
+### Non-Breaking
+
+- Add new `mempool-test-utils` public library containing utilities for opening a
+  mocked mempool.
+
+<!--
+### Breaking
+
+- A bullet item for the Breaking category.
+
+-->