nixos service: remove deprecated params

IntersectMBO · Jul 8, 2020 · 3317beb · 3317beb
1 parent 4df7dc6
commit 3317beb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 32 deletions.
diff --git a/nix/nixos/cardano-cluster-service.nix b/nix/nixos/cardano-cluster-service.nix
@@ -193,9 +193,6 @@ in {
       topology              = shelley-topology;
       port                  = toString shelley-port;
       hostAddr              = "127.1.0.$((1 + $1))";
-      inherit genesisFile;
-      genesisHash           = null;
-      genesisHashPath       = genesisHashPath;
       delegationCertificate = pbft-cert-shexpr;
       signingKey            = pbft-sig-key-shexpr;
       runtimeDir            = null;

diff --git a/nix/nixos/cardano-node-service.nix b/nix/nixos/cardano-node-service.nix
@@ -126,33 +126,6 @@ in {
         '';
       };
 
-     # TODO: remove
-     genesisFile = mkOption {
-        type = types.path;
-        default = envConfig.genesisFile;
-        description = ''
-          Genesis json file
-        '';
-      };
-
-     # TODO: remove
-      genesisHash = mkOption {
-        type = types.nullOr types.str;
-        default = envConfig.genesisHash;
-        description = ''
-          Hash of the genesis file
-        '';
-      };
-
-     # TODO: remove
-      genesisHashPath = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        description = ''
-          Path to the Hash of the genesis file
-        '';
-      };
-
       # Byron signing/delegation
 
       signingKey = mkOption {

diff --git a/nix/svclib.nix b/nix/svclib.nix
@@ -11,8 +11,7 @@ let
     { inherit NodeId; } //
     (optionalAttrs (cfg.protover-major or null != null) { LastKnownBlockVersion-Major = cfg.protover-major; }) //
     (optionalAttrs (cfg.protover-minor or null != null) { LastKnownBlockVersion-Minor = cfg.protover-minor; }) //
-    (optionalAttrs (cfg.protover-alt   or null != null) { LastKnownBlockVersion-Alt   = cfg.protover-alt;   }) //
-    (optionalAttrs (cfg.genesisFile != null) { GenesisFile = cfg.genesisFile;   });
+    (optionalAttrs (cfg.protover-alt   or null != null) { LastKnownBlockVersion-Alt   = cfg.protover-alt;   });
 
   ## mkFullyConnectedLocalClusterTopologyWithProxy
   ##   :: (Int NodeId -> String Address)