Merge #958

958: nix: Add necessary test data files to windows testing bundle r=rvl a=rvl Relates to #703. # Overview - Includes test data in the zip file so that tests can pass. - Fixes `launch.bat` - Updates the Haskell.nix revision so that it's on the master branch, not a PR branch. # Comments Testing procedure is in #703. Co-authored-by: Rodney Lorrimar <[email protected]>
cardano-foundation · Nov 6, 2019 · 6d2e31d · 6d2e31d
2 parents 93978c8 + bc9a604
commit 6d2e31d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/nix/haskell-nix-src.json b/nix/haskell-nix-src.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/input-output-hk/haskell.nix",
-  "rev": "fcba9447b31a0802fab15f46fa18d6b9675ab528",
-  "date": "2019-11-02T21:33:00+13:00",
-  "sha256": "0s7gdcjxv8y7bmbi7wd5cp8jlvdcn2bgf8kaqyy25x0bqcdafaz3",
+  "rev": "8406e45c8e5648e6dea22e349f0e596bbdf68313",
+  "date": "2019-11-05T01:09:54+00:00",
+  "sha256": "1hixh4n16294xllgx44hfgkwzjllp5gyj24lyhpmr0yqcsh4fy2i",
   "fetchSubmodules": false
 }
diff --git a/nix/windows-release.nix b/nix/windows-release.nix
@@ -15,33 +15,37 @@
 }:
 
 let
-  testData = ../lib/jormungandr/test/data/jormungandr;
+  testData = {
+    core = ../lib/core/test/data;
+    jormungandr = ../lib/jormungandr/test/data;
+  };
+
   name = "cardano-wallet-jormungandr-${project.version}-win64";
   jm-bat = pkgs.writeText "jm.bat" ''
-    jormungandr.exe --config config.yaml --genesis-block block0.bin --secret secret.yaml
+    jormungandr.exe --config test\data\jormungandr\config.yaml --genesis-block test\data\jormungandr\block0.bin --secret test\data\jormungandr\secret.yaml
   '';
   cw-bat = pkgs.writeText "cw.bat" ''
-    cardano-wallet-jormungandr.exe serve --node-port 8080 --genesis-block-hash HASH --database c:\\cardano-wallet-jormungandr\\wallets
+    cardano-wallet-jormungandr.exe serve --node-port 8080 --genesis-block-hash HASH --database c:\cardano-wallet-jormungandr\wallets
   '';
   launch-bat = pkgs.writeText "launch.bat" ''
-    cardano-wallet-jormungandr.exe launch --genesis-block-hash HASH --state-dir c:\\cardano-wallet-jormungandr %*
+    cardano-wallet-jormungandr.exe launch --genesis-block test\data\jormungandr\block0.bin --state-dir c:\cardano-wallet-jormungandr -- --config test\data\jormungandr\config.yaml --secret test\data\jormungandr\secret.yaml
   '';
 
 in pkgs.runCommand name {
   nativeBuildInputs = [ pkgs.zip pkgs.jq pkgs.gnused project.jormungandr-cli ];
   passthru = { inherit tests benchmarks; };
 } ''
-  mkdir -pv jm $out/nix-support
+  mkdir -pv jm jm/test/data $out/nix-support
   cd jm
 
   cp -v ${cardano-wallet-jormungandr}/bin/* .
-  cp -v ${testData}/block0.bin ${testData}/secret.yaml .
+  cp -Rv --no-preserve=mode ${testData.core}/* ${testData.jormungandr}/* test/data
   cp -v ${jm-bat} jm.bat
-  hash="$(jcli genesis hash --input block0.bin)"
+  hash="$(jcli genesis hash --input test/data/jormungandr/block0.bin)"
   sed -e "s/HASH/$hash/" ${cw-bat} > cw.bat
   sed -e "s/HASH/$hash/" ${launch-bat} > launch.bat
-  sed -e 's/storage:.*/storage: "c:\\\\cardano-wallet-jormungandr\\\\chain"/' \
-      ${testData}/config.yaml > config.yaml
+  sed -e 's/storage:.*/storage: "c:\\cardano-wallet-jormungandr\\chain"/' \
+      ${testData.jormungandr}/jormungandr/config.yaml > config.yaml
 
   ${pkgs.lib.concatMapStringsSep "\n" (test: ''
     pkg=`ls -1 ${test}`