fix: update tests and fix running on main-0.6

Author: zippy

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: Run tests
 on:
   pull_request:
   push:
-    branches: [main]
+    branches: [main, main-0.6]
 
 concurrency:
   group: ${{ github.ref_name }}

Cargo.lock

@@ -6,8 +6,8 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-hdi = "0.7.0-dev.13"
-hdk = "0.6.0-dev.15"
+hdi = "0.7.1-rc.1"
+hdk = "0.6.1-rc.1"
 holochain_serialized_bytes = "0.0.56"
 serde = "1.0.192"
 

Cargo.toml

@@ -273,7 +273,10 @@ export class Conductor {
     });
   }
 
-  setNetworkConfig(createConductorOptions: NetworkConfig, signalingServerUrl?: URL) {
+  setNetworkConfig(
+    createConductorOptions: NetworkConfig,
+    signalingServerUrl?: URL,
+  ) {
     const conductorConfig = readFileSync(
       `${this.conductorDir}/${CONDUCTOR_CONFIG}`,
       "utf-8",

package-lock.json

@@ -50,7 +50,7 @@ test("Conductor with custom bootstrap server", async () => {
 });
 
 test("Conductor with custom signaling server", async () => {
-  const signalingServerUrl = new URL("ws://some-signal.server:1234");
+  const signalingServerUrl = new URL("http://some-signal.server:1234");
   const conductor = await createConductor(signalingServerUrl, {
     startup: false,
   });

ts/src/conductor.ts

@@ -120,7 +120,6 @@ test("Set custom network config", async () => {
   const minInitiateIntervalMs = 20_000;
   const initiateJitterMs = 5_000;
   const roundTimeoutMs = 20_000;
-  const transportTimeoutS = 1_000;
   const targetArcFactor = 0;
 
   const alice = await scenario.addPlayerWithApp({
@@ -134,7 +133,6 @@ test("Set custom network config", async () => {
         minInitiateIntervalMs,
         initiateJitterMs,
         roundTimeoutMs,
-        transportTimeoutS,
         targetArcFactor,
       },
     },
@@ -158,15 +156,15 @@ test("Set custom network config", async () => {
   assert.strictEqual(network.target_arc_factor, targetArcFactor);
 
   assert.ok(
-    advanced && typeof advanced === "object" && "tx5Transport" in advanced,
+    advanced && typeof advanced === "object" && "irohTransport" in advanced,
   );
-  const { tx5Transport } = advanced;
+  const { irohTransport } = advanced;
   assert.ok(
-    tx5Transport &&
-      typeof tx5Transport === "object" &&
-      "timeoutS" in tx5Transport,
+    irohTransport &&
+      typeof irohTransport === "object" &&
+      "relayAllowPlainText" in irohTransport,
   );
-  assert.strictEqual(tx5Transport.timeoutS, transportTimeoutS);
+  assert.strictEqual(irohTransport.relayAllowPlainText, true);
 
   assert.ok(advanced && typeof advanced === "object" && "k2Gossip" in advanced);
   const { k2Gossip } = advanced;
@@ -192,7 +190,6 @@ test("Default network config", async () => {
   const minInitiateIntervalMs = 3_000;
   const initiateJitterMs = 1_000;
   const roundTimeoutMs = 5_000;
-  const transportTimeoutS = 15;
   const targetArcFactor = 1;
 
   const alice = await scenario.addPlayerWithApp({
@@ -220,15 +217,15 @@ test("Default network config", async () => {
   assert.strictEqual(network.target_arc_factor, targetArcFactor);
 
   assert.ok(
-    advanced && typeof advanced === "object" && "tx5Transport" in advanced,
+    advanced && typeof advanced === "object" && "irohTransport" in advanced,
   );
-  const { tx5Transport } = advanced;
+  const { irohTransport } = advanced;
   assert.ok(
-    tx5Transport &&
-      typeof tx5Transport === "object" &&
-      "timeoutS" in tx5Transport,
+    irohTransport &&
+      typeof irohTransport === "object" &&
+      "relayAllowPlainText" in irohTransport,
   );
-  assert.strictEqual(tx5Transport.timeoutS, transportTimeoutS);
+  assert.strictEqual(irohTransport.relayAllowPlainText, true);
 
   assert.ok(advanced && typeof advanced === "object" && "k2Gossip" in advanced);
   const { k2Gossip } = advanced;