byron-proxy-scripts: parse pbftThreshold from envConfig

input-output-hk · Aug 13, 2019 · 8751c3a · 8751c3a
1 parent fd0273a
commit 8751c3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/nix/byron-proxy-scripts.nix b/nix/byron-proxy-scripts.nix
@@ -11,16 +11,19 @@ let
       relays: [[{ host: ${relay} }]]
   '';
   pkgs = commonLib.pkgs;
+  inherit (pkgs) lib;
   mkProxyScript = environment: let
     envConfig = environments.${environment};
     config = {
       proxyHost = "127.0.0.1";
       proxyPort = 7777;
       topologyFile = mkTopology envConfig.relays;
       loggingConfig = ../cfg/logging.yaml;
-    } // customConfig;
+      pbftThreshold = null;
+    } // envConfig
+      // customConfig;
   in with config; pkgs.writeScript "byron-proxy-${environment}" ''
-    exec ${byronProxy}/bin/cardano-byron-proxy +RTS -T -RTS --database-path db-byron-proxy-${environment} --index-path index-byron-proxy-${environment} --configuration-file ${configuration}/lib/configuration.yaml --configuration-key ${envConfig.confKey} --topology ${topologyFile} --logger-config ${loggingConfig} --local-addr [${proxyHost}]:${toString proxyPort}
+    exec ${byronProxy}/bin/cardano-byron-proxy +RTS -T -RTS --database-path db-byron-proxy-${environment} --index-path index-byron-proxy-${environment} --configuration-file ${configuration}/lib/configuration.yaml --configuration-key ${envConfig.confKey} --topology ${topologyFile} --logger-config ${loggingConfig} --local-addr [${proxyHost}]:${toString proxyPort} ${lib.optionalString (pbftThreshold != null) "--pbft-threshold ${pbftThreshold}"}
   '';
   configuration = cardanoConfig;
 

diff --git a/nix/old-cardano-sl-src.json b/nix/old-cardano-sl-src.json
@@ -1,6 +1,6 @@
 {
   "url": "https://github.com/input-output-hk/cardano-sl",
-  "rev": "21c288c4ef2011b7fbe5b52d61f49ee49820a4fe",
-  "sha256": "13bkyl9kh918gdipgv9hpyxh7h45dr4bd34q9mpspbif6sh380ip",
+  "rev": "95beb3b78f20738e71df4bcc44de0f0bb17c47d6",
+  "sha256": "15qmi283x3azifpslq67wx0pa47xm2rv9fi4iazmmg9mp88m25z3",
   "fetchSubmodules": false
 }