Merge pull request #6265 from IntersectMBO/coot/peer-sharing-comment

Removed stale comment, code formatting, bench config

Author: mgmeier

cardano-node/src/Cardano/Node/Configuration/POM.hs

@@ -407,7 +407,6 @@ instance FromJSON PartialNodeConfiguration where
               Just True  -> Last $ Just EnabledP2PMode
 
       -- Peer Sharing
-      -- DISABLED BY DEFAULT
       pncPeerSharing <- Last <$> v .:? "PeerSharing"
 
       -- pncConsensusMode determines whether Genesis is enabled in the first place.
@@ -672,52 +671,45 @@ defaultPartialNodeConfiguration =
             DefaultQueryBatchSize
             V2InMemory
             noDeprecatedOptions
-    , pncProtocolIdleTimeout   = Last (Just Ouroboros.defaultProtocolIdleTimeout)
-    , pncTimeWaitTimeout       = Last (Just Ouroboros.defaultTimeWaitTimeout)
-    , pncEgressPollInterval    = Last (Just Ouroboros.defaultEgressPollInterval)
-    , pncAcceptedConnectionsLimit =
-        Last (Just Ouroboros.defaultAcceptedConnectionsLimit)
-    , pncChainSyncIdleTimeout           = mempty
-    , pncDeadlineTargetOfRootPeers        = Last (Just deadlineRoots)
-    , pncDeadlineTargetOfKnownPeers       = Last (Just deadlineKnown)
-    , pncDeadlineTargetOfEstablishedPeers = Last (Just deadlineEstablished)
-    , pncDeadlineTargetOfActivePeers      = Last (Just deadlineActive)
-    , pncDeadlineTargetOfKnownBigLedgerPeers       = Last (Just deadlineBigKnown)
-    , pncDeadlineTargetOfEstablishedBigLedgerPeers = Last (Just deadlineBigEst)
-    , pncDeadlineTargetOfActiveBigLedgerPeers      = Last (Just deadlineBigAct)
-    , pncSyncTargetOfRootPeers          = Last (Just syncRoots)
-    , pncSyncTargetOfKnownPeers         = Last (Just syncKnown)
-    , pncSyncTargetOfEstablishedPeers   = Last (Just syncEstablished)
-    , pncSyncTargetOfActivePeers        = Last (Just syncActive)
-    , pncSyncTargetOfKnownBigLedgerPeers       = Last (Just syncBigKnown)
-    , pncSyncTargetOfEstablishedBigLedgerPeers = Last (Just syncBigEst)
-    , pncSyncTargetOfActiveBigLedgerPeers      = Last (Just syncBigAct)
+    , pncProtocolIdleTimeout      = Last (Just Ouroboros.defaultProtocolIdleTimeout)
+      -- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/Ouroboros-Network-Diffusion-Configuration.html#v:defaultProtocolIdleTimeout
+    , pncTimeWaitTimeout          = Last (Just Ouroboros.defaultTimeWaitTimeout)
+      -- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/Ouroboros-Network-Diffusion-Configuration.html#v:defaultTimeWaitTimeout
+    , pncEgressPollInterval       = Last (Just Ouroboros.defaultEgressPollInterval)
+      -- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/Ouroboros-Network-Diffusion-Configuration.html#v:defaultEgressPollInterval
+    , pncAcceptedConnectionsLimit = Last (Just Ouroboros.defaultAcceptedConnectionsLimit)
+      -- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/Ouroboros-Network-Diffusion-Configuration.html#v:defaultAcceptedConnectionsLimit
+    , pncChainSyncIdleTimeout     = mempty
+
+    , pncDeadlineTargetOfRootPeers                 = Last (Just $ targetNumberOfRootPeers                 Ouroboros.defaultDeadlineTargets)
+    , pncDeadlineTargetOfKnownPeers                = Last (Just $ targetNumberOfKnownPeers                Ouroboros.defaultDeadlineTargets)
+    , pncDeadlineTargetOfEstablishedPeers          = Last (Just $ targetNumberOfEstablishedPeers          Ouroboros.defaultDeadlineTargets)
+    , pncDeadlineTargetOfActivePeers               = Last (Just $ targetNumberOfActivePeers               Ouroboros.defaultDeadlineTargets)
+    , pncDeadlineTargetOfKnownBigLedgerPeers       = Last (Just $ targetNumberOfKnownBigLedgerPeers       Ouroboros.defaultDeadlineTargets)
+    , pncDeadlineTargetOfEstablishedBigLedgerPeers = Last (Just $ targetNumberOfEstablishedBigLedgerPeers Ouroboros.defaultDeadlineTargets)
+    , pncDeadlineTargetOfActiveBigLedgerPeers      = Last (Just $ targetNumberOfActiveBigLedgerPeers      Ouroboros.defaultDeadlineTargets)
+      -- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/Ouroboros-Network-Diffusion-Configuration.html#v:defaultDeadlineTargets
+
+    , pncSyncTargetOfRootPeers                     = Last (Just $ targetNumberOfRootPeers                 Cardano.defaultSyncTargets)
+    , pncSyncTargetOfKnownPeers                    = Last (Just $ targetNumberOfKnownPeers                Cardano.defaultSyncTargets)
+    , pncSyncTargetOfEstablishedPeers              = Last (Just $ targetNumberOfEstablishedPeers          Cardano.defaultSyncTargets)
+    , pncSyncTargetOfActivePeers                   = Last (Just $ targetNumberOfActivePeers               Cardano.defaultSyncTargets)
+    , pncSyncTargetOfKnownBigLedgerPeers           = Last (Just $ targetNumberOfKnownBigLedgerPeers       Cardano.defaultSyncTargets)
+    , pncSyncTargetOfEstablishedBigLedgerPeers     = Last (Just $ targetNumberOfEstablishedBigLedgerPeers  Cardano.defaultSyncTargets)
+    , pncSyncTargetOfActiveBigLedgerPeers          = Last (Just $ targetNumberOfActiveBigLedgerPeers      Cardano.defaultSyncTargets)
+      -- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/cardano-diffusion/Cardano-Network-Diffusion-Configuration.html#v:defaultSyncTargets
+
     , pncMinBigLedgerPeersForTrustedState = Last (Just Cardano.defaultNumberOfBigLedgerPeers)
+      -- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/cardano-diffusion/Cardano-Network-Diffusion-Configuration.html#v:defaultNumberOfBigLedgerPeers
     , pncConsensusMode = Last (Just Ouroboros.defaultConsensusMode)
+      -- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/Ouroboros-Network-Diffusion-Configuration.html#v:defaultConsensusMode
     , pncEnableP2P     = Last (Just EnabledP2PMode)
     , pncPeerSharing   = Last (Just Ouroboros.defaultPeerSharing)
+      -- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/Ouroboros-Network-Diffusion-Configuration.html#v:defaultPeerSharing 
     , pncGenesisConfigFlags = Last (Just defaultGenesisConfigFlags)
+      -- https://ouroboros-consensus.cardano.intersectmbo.org/haddocks/ouroboros-consensus-diffusion/Ouroboros-Consensus-Node-Genesis.html#v:defaultGenesisConfigFlags
     , pncResponderCoreAffinityPolicy = Last $ Just NoResponderCoreAffinity
     }
-  where
-    PeerSelectionTargets {
-      targetNumberOfRootPeers        = deadlineRoots,
-      targetNumberOfKnownPeers       = deadlineKnown,
-      targetNumberOfEstablishedPeers = deadlineEstablished,
-      targetNumberOfActivePeers      = deadlineActive,
-      targetNumberOfKnownBigLedgerPeers       = deadlineBigKnown,
-      targetNumberOfEstablishedBigLedgerPeers = deadlineBigEst,
-      targetNumberOfActiveBigLedgerPeers      = deadlineBigAct
-    } = Ouroboros.defaultDeadlineTargets
-    PeerSelectionTargets {
-      targetNumberOfRootPeers        = syncRoots,
-      targetNumberOfKnownPeers       = syncKnown,
-      targetNumberOfEstablishedPeers = syncEstablished,
-      targetNumberOfActivePeers      = syncActive,
-      targetNumberOfKnownBigLedgerPeers       = syncBigKnown,
-      targetNumberOfEstablishedBigLedgerPeers = syncBigEst,
-      targetNumberOfActiveBigLedgerPeers      = syncBigAct
-    } = Cardano.defaultSyncTargets
 
 lastOption :: Parser a -> Parser (Last a)
 lastOption = fmap Last . optional

nix/workbench/service/nodes.nix

@@ -107,6 +107,7 @@ let
                   TurnOnLogMetrics             = true;
                   SnapshotInterval             = 4230;
                   ChainSyncIdleTimeout         = 0;
+                  PeerSharing                  = false;
 
                   ## defaults taken from: ouroboros-network/src/Ouroboros/Network/Diffusion/Configuration.hs
                   ## NB. the following inequality must hold: known >= established >= active >= 0