Nix definitions: update to the topology trimming

IntersectMBO · Nov 20, 2019 · e701a1f · e701a1f
1 parent a2c9b2e
commit e701a1f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/nix/nixos/cardano-cluster-service.nix b/nix/nixos/cardano-cluster-service.nix
@@ -10,10 +10,11 @@ let
   node-ids = range 0 (cfg.node-count - 1);
   cardano-node = ncfg.package;
 
-  # mkFullyConnectedLocalClusterTopology
-  #   :: Address String -> Port String -> Int -> Int -> Topology FilePath
-  mkFullyConnectedLocalClusterTopology =
+  # mkFullyConnectedLocalNodeSetup
+  #   :: Address String -> Port String -> Port String -> Int -> Int -> Topology FilePath
+  mkFullyConnectedLocalNodeSetup =
     { hostAddr
+    , port
     , portBase
     , node-count
     , valency ? 1
@@ -22,12 +23,11 @@ let
       addr = hostAddr;
       ports = map (x: portBase + x) (range 0 (node-count - 1));
       mkPeer = port: { inherit addr port valency; };
-      mkNodeTopo = nodeId: port: {
-        inherit nodeId;
+      mkNodeTopo = port: {
         nodeAddress = { inherit addr port; };
         producers = map mkPeer (remove port ports);
       };
-    in toFile "topology.yaml" (toJSON (imap0 mkNodeTopo ports));
+    in toFile "topology.yaml" (toJSON (mkNodeTopo port));
 
   ## Note how some values are literal strings, and some integral.
   ## This is an important detail.
@@ -122,11 +122,12 @@ let
   delegationCertificate = ''$(printf "%s/delegation-cert.%03d.json" $(dirname $2) $1)'';
   nodeId                = "$1";
   port                  = "$((${toString portBase} + $1))";
-  topology = mkFullyConnectedLocalClusterTopology
+  mkNetworkConfig = port: mkFullyConnectedLocalNodeSetup
     { inherit (cfg)  node-count;
       inherit (ncfg) hostAddr;
-      inherit portBase;
+      inherit port portBase;
     };
+  network-configs = map mkNetworkConfig (range portBase (portBase + cfg.node-count - 1));
 in {
   options = with types; {
 
@@ -154,7 +155,8 @@ in {
       enable = true;
       instanced = true;
       genesisHash = genesisHashValue;
-      inherit topology genesisFile signingKey delegationCertificate nodeId port;
+      inherit genesisFile signingKey delegationCertificate nodeId port;
+      topology = ''$(choice "$1" ${concatStringsSep " " network-configs})'';
     };
     services.chairman.genesisHash = genesisHashValue;
     systemd.services."cardano-node@" = {

diff --git a/nix/nixos/cardano-node-service.nix b/nix/nixos/cardano-node-service.nix
@@ -22,12 +22,12 @@ let
           # "--node-id ${toString cfg.nodeId}"
           "--host-addr ${cfg.hostAddr}"
           "--port ${toString cfg.port}"
-          "${lib.optionalString (cfg.pbftThreshold != null) "--pbft-signature-threshold ${cfg.pbftThreshold}"}"
           "${lib.optionalString (cfg.signingKey != null) "--signing-key ${cfg.signingKey}"}"
           "${lib.optionalString (cfg.delegationCertificate != null) "--delegation-certificate ${cfg.delegationCertificate}"}"
           "${cfg.extraArgs}"
         ];
     in ''
+        choice() { i=$1; shift; eval "echo \''${$((i + 1))}"; }
         echo "Starting ${exec}: '' + concatStringsSep "\"\n   echo \"" cmd + ''"
         echo "..or, once again, in a signle line:"
         echo "''                   + concatStringsSep " "              cmd + ''"
@@ -188,7 +188,7 @@ in {
       };
 
       topology = mkOption {
-        type = types.path;
+        type = types.string;
         default = mkEdgeTopology {
           inherit (cfg) hostAddr nodeId port;
           edgeHost = envConfig.edgeHost or "127.0.0.1";

diff --git a/nix/nixos/chairman-as-a-service.nix b/nix/nixos/chairman-as-a-service.nix
@@ -22,7 +22,6 @@ let
         exec = "chairman";
         cmd = builtins.filter (x: x != "") [
           "${ncfg.package}/bin/chairman"
-          "--${ncfg.consensusProtocol}"
           (nodeIdArgs)
           "--timeout ${toString cfg.timeout}"
           "--database-path ${cfg.stateDir}/${cfg.dbPrefix}"