Move TxDecisionPolicy to MiniProtocolParamenters

Author: bolt12

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission/TxLogic.hs

@@ -1,6 +1,6 @@
-{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE BangPatterns        #-}
 {-# LANGUAGE BlockArguments      #-}
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DeriveGeneric       #-}
 {-# LANGUAGE FlexibleContexts    #-}
 {-# LANGUAGE FlexibleInstances   #-}

ouroboros-network/src/Ouroboros/Network/NodeToNode.hs

@@ -154,7 +154,8 @@ import Ouroboros.Network.Subscription.Worker (LocalAddresses (..),
            SubscriberError)
 import Ouroboros.Network.Tracers
 import Ouroboros.Network.TxSubmission.Inbound qualified as TxInbound
-import Ouroboros.Network.TxSubmission.Inbound.Policy (max_TX_SIZE)
+import Ouroboros.Network.TxSubmission.Inbound.Policy (TxDecisionPolicy (..),
+           defaultTxDecisionPolicy, max_TX_SIZE)
 import Ouroboros.Network.TxSubmission.Outbound qualified as TxOutbound
 import Ouroboros.Network.Util.ShowProxy (ShowProxy, showProxy)
 
@@ -212,17 +213,16 @@ data MiniProtocolParameters = MiniProtocolParameters {
       blockFetchPipeliningMax     :: !Word16,
       -- ^ maximal number of pipelined messages in 'block-fetch' mini-protocol.
 
-      txSubmissionMaxUnacked      :: !NumTxIdsToAck
-      -- ^ maximal number of unacked tx (pipelining is bounded by twice this
-      -- number)
+      txDecisionPolicy            :: !TxDecisionPolicy
+      -- ^ tx submission protocol decision logic parameters
     }
 
 defaultMiniProtocolParameters :: MiniProtocolParameters
 defaultMiniProtocolParameters = MiniProtocolParameters {
       chainSyncPipeliningLowMark  = 200
     , chainSyncPipeliningHighMark = 300
     , blockFetchPipeliningMax     = 100
-    , txSubmissionMaxUnacked       = 10
+    , txDecisionPolicy            = defaultTxDecisionPolicy
   }
 
 -- | Make an 'OuroborosApplication' for the bundle of mini-protocols that
@@ -346,7 +346,9 @@ blockFetchProtocolLimits MiniProtocolParameters { blockFetchPipeliningMax } = Mi
       max (10 * 2_097_154 :: Int) (fromIntegral blockFetchPipeliningMax * 90_112)
   }
 
-txSubmissionProtocolLimits MiniProtocolParameters { txSubmissionMaxUnacked } = MiniProtocolLimits {
+txSubmissionProtocolLimits MiniProtocolParameters
+                             { txDecisionPolicy = TxDecisionPolicy { maxUnacknowledgedTxIds }
+                             } = MiniProtocolLimits {
       -- tx-submission server can pipeline both 'MsgRequestTxIds' and
       -- 'MsgRequestTx'. This means that there can be many
       -- 'MsgReplyTxIds', 'MsgReplyTxs' messages in an inbound queue (their
@@ -409,7 +411,7 @@ txSubmissionProtocolLimits MiniProtocolParameters { txSubmissionMaxUnacked } = M
       -- 10% as a safety margin.
       --
       maximumIngressQueue = addSafetyMargin $
-          fromIntegral txSubmissionMaxUnacked * (44 + fromIntegral @SizeInBytes @Int max_TX_SIZE)
+          fromIntegral maxUnacknowledgedTxIds * (44 + fromIntegral @SizeInBytes @Int max_TX_SIZE)
     }
 
 keepAliveProtocolLimits _ =

ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/Policy.hs

@@ -55,7 +55,6 @@ defaultTxDecisionPolicy =
   TxDecisionPolicy {
     maxNumTxIdsToRequest   = 3,
     maxUnacknowledgedTxIds = 10, -- must be the same as txSubmissionMaxUnacked
-                                 -- TODO: we should take it `MiniProtocolParameters`.
     txsSizeInflightPerPeer = max_TX_SIZE * 6,
     maxTxsSizeInflight     = max_TX_SIZE * 20,
     txInflightMultiplicity = 1