address comments from review

holochain · Oct 1, 2024 · dc76355 · dc76355
1 parent 6c91b38
commit dc76355
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
         run: nix develop -c $SHELL -c "./build-trycp.sh"
 
       - name: Run TryCP integration tests
-        run: nix develop -c $SHELL -c "cargo test -p trycp_server --test integration --release --target-dir crates/trycp_server/target"
+        run: nix develop -c $SHELL -c "cargo test -p trycp_server --release --target-dir crates/trycp_server/target"
 
       - name: Save TryCP build to cache
         uses: actions/cache/save@v4

diff --git a/Cargo.toml b/Cargo.toml
@@ -10,8 +10,8 @@ resolver = "2"
 
 [workspace.dependencies]
 futures = "0.3"
-hdi = "0.5.0-dev.17"
-hdk = "0.4.0-dev.19"
+hdi = "0.5.0-dev.1"
+hdk = "0.4.0-dev.1"
 nix = { version = "0.29.0", features = ["signal"] }
 once_cell = "1.5.0"
 parking_lot = "0.12"

diff --git a/crates/trycp_server/src/configure_player.rs b/crates/trycp_server/src/configure_player.rs
@@ -36,7 +36,7 @@ pub(crate) fn configure_player(
 
     let mut admin_port = NEXT_ADMIN_PORT.fetch_add(1, Ordering::SeqCst);
     loop {
-        ensure!(admin_port <= ADMIN_PORT_RANGE.end, OutOfPorts);
+        ensure!(ADMIN_PORT_RANGE.contains(&admin_port), OutOfPorts);
         let listener = TcpListener::bind(format!("localhost:{admin_port}"));
         if let Ok(p) = listener {
             admin_port = p.local_addr().unwrap().port();

diff --git a/ts/src/local/conductor.ts b/ts/src/local/conductor.ts
@@ -67,6 +67,8 @@ export interface ConductorOptions {
 
   /**
    * Set a DPKI network seed in the conductor instance.
+   *
+   * Defaults to "deepkey-test".
    */
   dpkiNetworkSeed?: NetworkSeed;
 
@@ -152,7 +154,7 @@ export class Conductor implements IConductor {
   ) {
     if (options?.noDpki && options?.dpkiNetworkSeed) {
       throw new Error(
-        "DPKI network can not be set when DPKI is disabled. Enable DPKI or do not provide a DPKI network seed."
+        "DPKI network seed can not be set when DPKI is disabled. Enable DPKI or do not provide a DPKI network seed."
       );
     }
 

diff --git a/ts/test/local/conductor.ts b/ts/test/local/conductor.ts
@@ -5,7 +5,6 @@ import {
   CellProvisioningStrategy,
   CloneId,
   EntryHash,
-  HolochainError,
   RevokeAgentKeyResponse,
   Signal,
   SignalCb,