move environments to iohk-nix

Author: disassembler

CHANGELOG.md

@@ -6,6 +6,10 @@
 ## Features
 - A new endpoint to calculate the walletid of a given mnemonic [#4237](https://github.com/input-output-hk/cardano-sl/pull/4237)
 
+### Improvements
+
+- Configuration files and environments map moved to iohk-nix [#4227](https://github.com/input-output-hk/cardano-sl/pull/4227)
+
 ## Cardano SL 3.0.3
 
 ### Improvements

default.nix

@@ -64,9 +64,9 @@ let
       inherit (scripts) connect;
       inherit (args) environment resume;
     };
-    mkTest = { environment, ...}: {
-      full  = acceptanceTest { inherit environment; resume = false; };
-      quick = acceptanceTest { inherit environment; resume = true; };
+    mkTest = environment: {
+      full  = acceptanceTest { environment = environment.name; resume = false; };
+      quick = acceptanceTest { environment = environment.name; resume = true; };
     };
   in commonLib.forEnvironments mkTest;
 in {

lib.nix

@@ -25,68 +25,20 @@ let
 
   pkgs = iohkNix.pkgs;
   lib = pkgs.lib;
-in lib // iohkNix // (rec {
-  utf8LocaleSetting = ''
-    export LC_ALL=en_GB.UTF-8
-    export LANG=en_GB.UTF-8
-  '';
-
-  # Blockchain networks and their configuration keys
-  environments = {
-    mainnet = {
-      relays = "relays.cardano-mainnet.iohk.io";
-      confKey = "mainnet_full";
-      genesisFile = ./lib/mainnet-genesis.json;
-      genesisHash = "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb";
-      private = false;
-    };
-    staging = {
-      relays = "relays.awstest.iohkdev.io";
-      confKey = "mainnet_dryrun_full";
-      genesisFile = ./lib/mainnet-genesis-dryrun-with-stakeholders.json;
-      genesisHash = "c6a004d3d178f600cd8caa10abbebe1549bef878f0665aea2903472d5abf7323";
-      private = false;
-    };
-    testnet = {
-      relays = "relays.cardano-testnet.iohkdev.io";
-      confKey = "testnet_full";
-      genesisFile = ./lib/testnet-genesis.json;
-      genesisHash = "96fceff972c2c06bd3bb5243c39215333be6d56aaf4823073dca31afe5038471";
-      private = false;
-    };
-    shelley_staging = {
-      relays = "relays.shelley-staging.aws.iohkdev.io";
-      confKey = "shelley_staging_full";
-      genesisFile = ./lib/shelley-staging-genesis.json;
-      genesisHash = "82995abf3e0e0f8ab9a6448875536a1cba305f3ddde18cd5ff54c32d7a5978c6";
-      private = false;
-    };
-    shelley_staging_short = {
-      relays = "relays.staging-shelley-short.aws.iohkdev.io";
-      confKey = "shelley_staging_short_full";
-      genesisFile = ./lib/shelley-staging-short-genesis.json;
-      genesisHash = "752ad119c4eb4cda927acb6f9e234887794775a22e9c11fb967d5fc2705bab04";
-      private = false;
-      pbftThreshold = "0.9";
-    };
+  environments = iohkNix.cardanoLib.environments // {
     demo = {
-      confKey = "dev";
-      relays = "127.0.0.1";
-      private = true;
+        confKey = "dev";
+        relays = "127.0.0.1";
+        private = true;
     };
   };
-
-  # Generates an attrset for the three cardano-sl networks by applying
-  # the given function to each environment.
-  #
-  # Example:
-  #   forEnvironments ({ environment, confKey, ... }: "key for ${environment} is ${confKey}")
-  #   => { demo = "key for demo is dev";
-  #        mainnet = "key for mainnet is mainnet_full";
-  #        staging = "key for staging is mainnet_dryrun_full";
-  #        testnet = "key for testnet is testnet_full"; }
   forEnvironments = f: lib.mapAttrs
-    (name: env: f (env // { environment = name; }))
+    (name: env: f (env // { inherit name; }))
     environments;
-
-})
+in lib // iohkNix.cardanoLib // iohkNix // {
+  inherit environments forEnvironments;
+  utf8LocaleSetting = ''
+    export LC_ALL=en_GB.UTF-8
+    export LANG=en_GB.UTF-8
+  '';
+}

nix/iohk-nix-src.json

@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/input-output-hk/iohk-nix",
-  "rev": "ec5463c3c3442ab3d80500af6c9a57310aed79db",
-  "date": "2019-08-09T20:49:52-04:00",
-  "sha256": "0m1f26awc9v7klzmah06x357hn04bxwyaj287aikjqn2gbg2v51m",
+  "rev": "0c0c2b69d44d067ef0fee60a95bcd06ecfdea53c",
+  "date": "2019-08-19T13:42:41-04:00",
+  "sha256": "0h716win6biipy37k5xx4br5v6vx1kpi8kixrg8iwrm72c7p3v74",
   "fetchSubmodules": false
 }

nix/scripts.nix

@@ -26,13 +26,14 @@ let
 in {
   # connect function required for acceptanceTests
   inherit connect;
-  connectScripts = commonLib.forEnvironments ({ environment, ... }:
+  connectScripts = commonLib.forEnvironments (environment:
   {
-    wallet = connect { inherit environment; };
-    explorer = connect { inherit environment; executable = "explorer"; };
+    wallet = connect { environment = environment.name; };
+    explorer = connect { environment = environment.name; executable = "explorer"; };
     proposal-ui = pkgs.callPackage ./launch/proposal-ui {
-      inherit cardanoConfig environment;
+      inherit cardanoConfig;
       inherit (nixTools.nix-tools.cexes.cardano-sl-script-runner) testcases;
+      environment = environment.name;
     };
 
   });
@@ -45,11 +46,11 @@ in {
       inherit cardanoConfig connect;
       inherit (nixTools.nix-tools.cexes.cardano-sl-node) cardano-node-simple;
     } // args);
-    makeDockerImage = { environment, ...}:
-      build { inherit environment; } // {
-        wallet   = build { inherit environment; type = "wallet"; };
-        explorer = build { inherit environment; type = "explorer"; };
-        node     = build { inherit environment; type = "node"; };
+    makeDockerImage = environment:
+      build { environment = environment.name; } // {
+        wallet   = build { environment = environment.name; type = "wallet"; };
+        explorer = build { environment = environment.name; type = "explorer"; };
+        node     = build { environment = environment.name; type = "node"; };
       };
   in commonLib.forEnvironments makeDockerImage;
 }