From 5bd9ba7c43bd9f49d7a8eff154c3f4d86aa8b5d4 Mon Sep 17 00:00:00 2001 From: Martin Kourim Date: Wed, 27 May 2026 15:16:51 +0200 Subject: [PATCH] tx-generator: make it buildable in leios-prototype - Codecs gained cLeiosNotifyCodec/cLeiosFetchCodec fields; extend myCodecs signature with two extra ByteString params. - byteLimitsKeepAlive no longer takes a size function; drop (const 0). - runPeer/runPeerWithLimits now return Maybe (Reception bytes); update kaClient return type and import Reception from Network.Mux.Channel. The `nix build .#tx-generator -o nix-build-tx-gen` now works. --- .../src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs index b17e44eefdf..768ef084424 100644 --- a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs +++ b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs @@ -27,6 +27,7 @@ import qualified Data.Map.Strict as Map import Data.Proxy (Proxy (..)) import Data.Void (Void, absurd) import qualified Network.Mux as Mux +import Network.Mux.Channel (Reception) import Network.Socket (AddrInfo (..)) import System.Random (newStdGen) @@ -115,7 +116,7 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec supportedVers = supportedNodeToNodeVersions (Proxy @blk) myCodecs :: Codecs blk NtN.RemoteAddress DeserialiseFailure IO ByteString ByteString ByteString ByteString ByteString ByteString - ByteString + ByteString ByteString ByteString myCodecs = defaultCodecs codecConfig blkN2nVer encodeRemoteAddress decodeRemoteAddress n2nVer peerMultiplex :: NtN.Versions NodeToNodeVersion NtN.NodeToNodeVersionData @@ -173,14 +174,14 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec => NodeToNodeVersion -> remotePeer -> Channel IO ByteString - -> IO ((), Maybe ByteString) + -> IO ((), Maybe (Reception ByteString)) kaClient _version them channel = do keepAliveRng <- newStdGen peerGSVMap <- liftIO . newTVarIO $ Map.singleton them defaultGSV runPeerWithLimits mempty (cKeepAliveCodec myCodecs) - (byteLimitsKeepAlive (const 0)) -- TODO: Real Bytelimits, see #1727 + byteLimitsKeepAlive -- TODO: Real Bytelimits, see #1727 timeLimitsKeepAlive channel $ keepAliveClientPeer