Run scenarios with CHC enabled

.github/workflows/test.yaml

@@ -108,6 +108,19 @@ jobs:
 
           pkill hc && pkill holochain && pkill lair-keystore
 
+      - name: Smoke test - dht_sync_lag with CHC enabled
+        run: |
+          # start the CHC reference implementation service
+          nix develop .#ci -c bash -c "hc-chc-service --port 8181 &"
+
+          # Start a sandbox conductor and run it in the background
+          nix develop .#ci -c bash -c "hc s clean && echo "1234" | hc s --piped create --chc-url http://localhost:8181 && echo "1234" | hc s --piped -f 8888 run &"
+
+          # Run the scenario for 5 seconds
+          RUST_LOG=info nix run .#dht_sync_lag -- --connection-string ws://localhost:8888 --agents 2 --behaviour write:1 --behaviour record_lag:1 --duration 5 --no-progress
+
+          pkill hc && pkill holochain && pkill lair-keystore
+
       - name: Smoke test - app_install
         run: |
           # Start a sandbox conductor and run it in the background
@@ -138,6 +151,22 @@ jobs:
 
           pkill hc && pkill holochain && pkill lair-keystore
 
+      - name: Smoke test - write_read with CHC enabled
+        run: |
+          # start the CHC reference implementation service
+          nix develop .#ci -c bash -c "hc-chc-service --port 8181 &"
+
+          # wait for the CHC service to be available
+          sleep 2
+
+          # Start a sandbox conductor and run it in the background
+          nix develop .#ci -c bash -c "hc s clean && echo "1234" | hc s --piped create --chc-url http://localhost:8181 && echo "1234" | hc s --piped -f 8888 run &"
+
+          # Run the scenario for 5 seconds
+          RUST_LOG=info nix run .#write_read -- --connection-string ws://localhost:8888 --duration 5 --no-progress
+
+          pkill hc && pkill holochain && pkill lair-keystore
+
       - name: Smoke test - write_query
         run: |
           # Start a sandbox conductor and run it in the background
@@ -148,6 +177,19 @@ jobs:
 
           pkill hc && pkill holochain && pkill lair-keystore
 
+      - name: Smoke test - write_query with CHC enabled
+        run: |
+          # start the CHC reference implementation service
+          nix develop .#ci -c bash -c "hc-chc-service --port 8181 &"
+
+          # Start a sandbox conductor and run it in the background
+          nix develop .#ci -c bash -c "hc s clean && echo "1234" | hc s --piped create --chc-url http://localhost:8181 && echo "1234" | hc s --piped -f 8888 run &"
+
+          # Run the scenario for 5 seconds
+          RUST_LOG=info nix run .#write_query -- --connection-string ws://localhost:8888 --duration 5 --no-progress
+
+          pkill hc && pkill holochain && pkill lair-keystore
+
       - name: Smoke test - local_signals
         run: |
           # Start a sandbox conductor and run it in the background
@@ -168,6 +210,19 @@ jobs:
 
           pkill hc && pkill holochain && pkill lair-keystore
 
+      - name: Smoke test - write_validated with CHC enabled
+        run: |
+          # start the CHC reference implementation service
+          nix develop .#ci -c bash -c "hc-chc-service --port 8181 &"
+
+          # Start a sandbox conductor and run it in the background
+          nix develop .#ci -c bash -c "hc s clean && echo "1234" | hc s --piped create --chc-url http://localhost:8181 && echo "1234" | hc s --piped -f 8888 run &"
+
+          # Run the scenario for 5 seconds
+          RUST_LOG=info nix run .#write_validated -- --connection-string ws://localhost:8888 --duration 5 --no-progress
+
+          pkill hc && pkill holochain && pkill lair-keystore
+
       - name: Smoke test - trycp_write_validated
         run: |
           set -x
@@ -185,6 +240,26 @@ jobs:
           # Stop local network services
           pkill hc-run-local
 
+      - name: Smoke test - trycp_write_validated with CHC enabled
+        run: |
+          set -x
+
+          # start the CHC reference implementation service
+          nix develop .#ci -c bash -c "hc-chc-service --port 8181 &"
+
+          # Start local network services
+          nix develop .#ci -c bash -c "hc-run-local-services --bootstrap-port 4422 --signal-port 4423 &"
+          # Start a TryCP instance
+          nix develop .#ci -c bash -c "source ./scripts/trycp.sh && start_trycp &"
+
+          # Run the scenario for 10 seconds
+          RUST_LOG=warn CONDUCTOR_CONFIG="CI" CHC_ENABLED="1" MIN_PEERS=2 nix run .#trycp_write_validated -- --targets targets-ci.yaml --instances-per-target 2 --duration 10 --no-progress
+
+          # Stop the TryCP instance
+          nix develop .#ci -c bash -c "source ./scripts/trycp.sh && stop_trycp"
+          # Stop local network services
+          pkill hc-run-local
+
       - name: Smoke test - remote_call_rate
         run: |
           set -x
@@ -217,6 +292,24 @@ jobs:
           # Stop local network services
           pkill hc-run-local
 
+      - name: Smoke test - two_party_countersigning with CHC enabled
+        run: |
+          # start the CHC reference implementation service
+          nix develop .#ci -c bash -c "hc-chc-service --port 8181 &"
+
+          # Start local network services
+          nix develop .#ci -c bash -c "hc-run-local-services --bootstrap-port 4422 --signal-port 4423 &"
+          # Start a TryCP instance
+          nix develop .#ci -c bash -c "source ./scripts/trycp.sh && start_trycp &"
+
+          # Run the scenario for 10 seconds
+          RUST_LOG=warn CONDUCTOR_CONFIG="CI" CHC_ENABLED="1" MIN_PEERS=2 nix run .#two_party_countersigning -- --targets targets-ci.yaml --behaviour initiate:1 --behaviour participate:1 --instances-per-target 2 --duration 10 --no-progress
+
+          # Stop the TryCP instance
+          nix develop .#ci -c bash -c "source ./scripts/trycp.sh && stop_trycp"
+          # Stop local network services
+          pkill hc-run-local
+
       - name: Smoke test - validation_receipts
         run: |
           set -x
@@ -251,6 +344,26 @@ jobs:
           # Stop local network services
           pkill hc-run-local
 
+      - name: Smoke test - validation_receipts with CHC enabled
+        run: |
+          set -x
+
+          # start the CHC reference implementation service
+          nix develop .#ci -c bash -c "hc-chc-service --port 8181 &"
+
+          # Start local network services
+          nix develop .#ci -c bash -c "hc-run-local-services --bootstrap-port 4422 --signal-port 4423 &"
+          # Start a TryCP instance
+          nix develop .#ci -c bash -c "source ./scripts/trycp.sh && start_trycp &"
+
+          # Run the scenario for 10 seconds
+          RUST_LOG=warn CONDUCTOR_CONFIG="CI" CHC_ENABLED="1" MIN_PEERS=2 nix run .#validation_receipts -- --targets targets-ci.yaml --instances-per-target 2 --duration 10 --no-progress
+
+          # Stop the TryCP instance
+          nix develop .#ci -c bash -c "source ./scripts/trycp.sh && stop_trycp"
+          # Stop local network services
+          pkill hc-run-local
+
       - name: Build scenario bundles
         if: runner.os == 'Linux'
         run: |

README.md

@@ -355,6 +355,14 @@ You can then start a second terminal and run one of the scenarios in the `scenar
 RUST_LOG=info CONDUCTOR_CONFIG="CI" TRYCP_RUST_LOG="info" MIN_PEERS=2 cargo run --package trycp_write_validated -- --targets targets-ci.yaml --instances-per-target 2 --duration 60
 ```
 
+#### Running Scenarios with CHC Enabled
+
+In order to run scenarios with chc enabled, you will need to run the [reference chc service](https://github.com/holochain/hc-chc-service) in a separate terminal window:
+
+```bash
+hc-chc-service --port 8181
+```
+
 ### Published crates
 
 Framework crates:

bindings/trycp_runner/src/macros.rs

@@ -1,14 +1,31 @@
 #[macro_export]
 macro_rules! embed_conductor_config {
     () => {
-        fn conductor_config() -> &'static str {
-            static CONDUCTOR_CONFIG: &str = include_str!("../../../conductor-config.yaml");
-            static CONDUCTOR_CONFIG_CI: &str = include_str!("../../../conductor-config-ci.yaml");
+        fn conductor_config() -> String {
+            static BASE_CONDUCTOR_CONFIG: &str =
+                include_str!("../../../conductor-config/conductor-config.yaml");
+            static BASE_CONDUCTOR_CONFIG_CI: &str =
+                include_str!("../../../conductor-config/conductor-config-ci.yaml");
+            static CHC_CONDUCTOR_CONFIG: &str =
+                include_str!("../../../conductor-config/with-chc.yaml");
 
-            match std::env::var("CONDUCTOR_CONFIG") {
-                Ok(value) if value == "CI" => CONDUCTOR_CONFIG_CI,
-                _ => CONDUCTOR_CONFIG,
+            let mut config = if std::env::var("CONDUCTOR_CONFIG")
+                .map(|value| value == "CI")
+                .unwrap_or(false)
+            {
+                BASE_CONDUCTOR_CONFIG_CI.to_owned()
+            } else {
+                BASE_CONDUCTOR_CONFIG.to_owned()
+            };
+
+            if std::env::var("CHC_ENABLED")
+                .map(|v| v == "1")
+                .unwrap_or(false)
+            {
+                config = format!("{}\n{}", config, CHC_CONDUCTOR_CONFIG);
             }
+
+            config
         }
     };
 }

conductor-config/with-chc.yaml

@@ -0,0 +1 @@
+chc_url: http://localhost:8181

flake.nix

@@ -25,6 +25,16 @@
       };
     };
 
+    chc-service = {
+      url = "github:holochain/hc-chc-service";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        crane.follows = "crane";
+        rust-overlay.follows = "rust-overlay";
+        holonix.follows = "holonix";
+      };
+    };
+
     crane = {
       url = "github:ipetkov/crane";
     };
@@ -55,6 +65,8 @@
     perSystem = { inputs', pkgs, system, config, ... }:
       let
         rustMod = flake-parts-lib.importApply ./nix/modules/rust.nix { inherit crane rust-overlay nixpkgs; };
+        cargoExtraArgs = "--features chc";
+        customHolochain = inputs'.holonix.packages.holochain.override { inherit cargoExtraArgs; };
       in
       {
         imports = [
@@ -81,11 +93,12 @@
             pkgs.taplo
             pkgs.yamlfmt
             pkgs.perl
+            customHolochain
             config.rustHelper.rust
-            inputs'.holonix.packages.holochain
             inputs'.holonix.packages.lair-keystore
             inputs'.holonix.packages.hn-introspect
             inputs'.tryorama.packages.trycp-server
+            inputs'.chc-service.packages.hc-chc-service
             inputs'.amber.packages.default
           ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
             pkgs.darwin.apple_sdk.frameworks.Security
@@ -111,6 +124,7 @@
             inputs'.holonix.packages.holochain
             inputs'.holonix.packages.lair-keystore
             inputs'.tryorama.packages.trycp-server
+            inputs'.chc-service.packages.hc-chc-service
           ];
         };