networking: p2p is now the sole network mode

Author: johnalotoski

cardano-lib/default.nix

@@ -94,7 +94,10 @@ let
       peerSnapshotFile = "${env.name}-peer-snapshot.json";
     };
   in
-    if (env.nodeConfig.EnableP2P or false)
+    # As of node 10.6.0 only p2p networking mode is available. Code supporting
+    # legacy networking will remain until the Dijkstra hard fork compels an
+    # upgrade.
+    if (env.nodeConfig.EnableP2P or true)
     then p2pTopology
     else legacyTopology;
 
@@ -144,9 +147,10 @@ let
   # as needed.  Any node version string suffixes, such as `-pre`, should be
   # removed from this string identifier.
   #
-  # Min currently 10.6.0 for proper default handling of PeerSharing,
+  # Min is currently 10.6.0 for proper default handling of PeerSharing,
   # TargetNumberOfKnownPeers and TargetNumberOfRootPeers parameters depending
-  # on whether node is a forger or not.
+  # on whether node is a forger or not, as well as removal of legacy
+  # networking mode.
   minNodeVersion = { MinNodeVersion = "10.6.0"; };
 
   mergeTraceOpts = cfg: traceOpts: cfg // {TraceOptions = getAttr "TraceOptions" cfg // traceOpts;};

cardano-lib/mainnet-config.nix

@@ -27,7 +27,6 @@ with builtins; {
 
   # The mainnet does not include the network magic into addresses. Testnets do.
   RequiresNetworkMagic = "RequiresNoMagic";
-  EnableP2P = true;
 
   MaxKnownMajorProtocolVersion = 2;
 

cardano-lib/preprod-config.nix

@@ -25,7 +25,6 @@ with builtins; {
 
   # The mainnet does not include the network magic into addresses. Testnets do.
   RequiresNetworkMagic = "RequiresMagic";
-  EnableP2P = true;
 
   # The consensus mode.  If set to "GenesisMode", a path to a peer snapshot
   # file will need to be declared in the p2p topology file under key

cardano-lib/preview-config.nix

@@ -19,7 +19,6 @@ with builtins; {
   Protocol = "Cardano";
 
   RequiresNetworkMagic = "RequiresMagic";
-  EnableP2P = true;
 
   ExperimentalHardForksEnabled = false;
   ExperimentalProtocolsEnabled = false;

cardano-lib/testnet-template/config-legacy.json

@@ -4,7 +4,6 @@
   "ApplicationVersion": 0,
   "ByronGenesisFile": "byron-genesis.json",
   "ConwayGenesisFile": "conway-genesis.json",
-  "EnableP2P": true,
   "ExperimentalHardForksEnabled": true,
   "ExperimentalProtocolsEnabled": true,
   "LastKnownBlockVersion-Alt": 0,

cardano-lib/testnet-template/config.json

@@ -5,7 +5,6 @@
   "ByronGenesisFile": "byron-genesis.json",
   "ConsensusMode": "PraosMode",
   "ConwayGenesisFile": "conway-genesis.json",
-  "EnableP2P": true,
   "ExperimentalHardForksEnabled": true,
   "ExperimentalProtocolsEnabled": true,
   "LastKnownBlockVersion-Alt": 0,