Test system signals (#233)

* Test system signals * Update client * Fix tests * Update ts/test/local/scenario.ts Co-authored-by: Jost Schulte <[email protected]> * Update ts/test/local/scenario.ts Co-authored-by: Jost Schulte <[email protected]> --------- Co-authored-by: Jost Schulte <[email protected]>
holochain · Aug 23, 2024 · a029a06 · a029a06
1 parent d5033e0
commit a029a06
Show file tree

Hide file tree

Showing 8 changed files with 213 additions and 52 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@holochain/client": "^0.18.0-dev.8",
+    "@holochain/client": "^0.18.0-dev.10",
     "get-port": "^6.1.2",
     "lodash": "^4.17.21",
     "uuid": "^8.3.2",

diff --git a/ts/test/fixture/zomes/coordinator/src/lib.rs b/ts/test/fixture/zomes/coordinator/src/lib.rs
@@ -1,5 +1,5 @@
 use hdk::prelude::*;
-use integrity::{Content, EntryTypes, UpdateInput};
+use integrity::{Content, EntryTypes, EntryTypesUnit, UpdateInput};
 
 #[hdk_extern]
 pub fn create(input: Content) -> ExternResult<ActionHash> {
@@ -42,3 +42,97 @@ fn signal_loopback(value: LoopBack) -> ExternResult<()> {
     emit_signal(&value)?;
     Ok(())
 }
+
+#[hdk_extern]
+fn create_two_party_countersigning_session(with_other: AgentPubKey) -> ExternResult<PreflightResponse> {
+    let my_agent_info = agent_info()?;
+
+    let entry = Content("hello".to_string());
+
+    let entry_hash = hash_entry(EntryTypes::Content(entry.clone()))?;
+
+    let session_times = session_times_from_millis(10_000)?;
+    let request = PreflightRequest::try_new(
+        entry_hash,
+        vec![
+            (
+                my_agent_info.agent_initial_pubkey,
+                vec![],
+            ),
+            (with_other.clone(), vec![]),
+        ],
+        Vec::with_capacity(0),
+        0,
+        true,
+        session_times,
+        ActionBase::Create(CreateBase::new(
+            EntryTypesUnit::Content.try_into()?,
+        )),
+        PreflightBytes(vec![]),
+    )
+        .map_err(|e| {
+            wasm_error!(WasmErrorInner::Guest(format!(
+            "Failed to create countersigning request: {:?}",
+            e
+        )))
+        })?;
+
+    // Accept ours now and then Holochain should wait for the other party to join the session
+    let my_acceptance = accept_countersigning_preflight_request(request.clone())?;
+
+    let response = match &my_acceptance {
+        PreflightRequestAcceptance::Accepted(response) => response.clone(),
+        e => {
+            return Err(wasm_error!(WasmErrorInner::Guest(format!(
+                "Unexpected response: {:?}",
+                e
+            ))))
+        }
+    };
+
+    Ok(response)
+}
+
+#[hdk_extern]
+fn accept_two_party(request: PreflightRequest) -> ExternResult<PreflightResponse> {
+    let my_accept = accept_countersigning_preflight_request(request)?;
+    match my_accept {
+        PreflightRequestAcceptance::Accepted(response) => {
+            Ok(response)
+        }
+        e => Err(wasm_error!(WasmErrorInner::Guest(format!(
+            "Unexpected response: {:?}",
+            e
+        )))),
+    }
+}
+
+#[hdk_extern]
+fn commit_two_party(responses: Vec<PreflightResponse>) -> ExternResult<()> {
+    let inner = Content("hello".to_string());
+
+    let entry = Entry::CounterSign(
+        Box::new(
+            CounterSigningSessionData::try_from_responses(responses, vec![]).map_err(
+                |countersigning_error| {
+                    wasm_error!(WasmErrorInner::Guest(countersigning_error.to_string()))
+                },
+            )?,
+        ),
+        inner.clone().try_into()?,
+    );
+
+    let agreement = EntryTypes::Content(inner);
+    let entry_def_index = ScopedEntryDefIndex::try_from(&agreement)?;
+    let visibility = EntryVisibility::from(&agreement);
+
+    hdk::prelude::create(CreateInput::new(
+        entry_def_index,
+        visibility,
+        entry,
+        // Countersigned entries MUST have strict ordering.
+        ChainTopOrdering::Strict,
+    ))?;
+
+    Ok(())
+}
diff --git a/ts/test/fixture/zomes/integrity/src/lib.rs b/ts/test/fixture/zomes/integrity/src/lib.rs
@@ -1,6 +1,7 @@
 use hdi::prelude::*;
 
 #[hdk_entry_helper]
+#[derive(Clone)]
 pub struct Content(pub String);
 
 #[hdk_entry_helper]

diff --git a/ts/test/local/conductor.ts b/ts/test/local/conductor.ts
@@ -6,6 +6,8 @@ import {
   CellProvisioningStrategy,
   CloneId,
   EntryHash,
+  Signal,
+  SignalType,
 } from "@holochain/client";
 import assert from "node:assert";
 import { readFileSync, realpathSync } from "node:fs";
@@ -165,10 +167,10 @@ test("Local Conductor - install app with deferred memproofs", async (t) => {
   const appWs = await conductor.connectAppWs(issued.token, port);
 
   let appInfo = await appWs.appInfo();
-  t.equal(
+  t.deepEqual(
     appInfo.status,
-    "awaiting_memproofs",
-    "app status is awaiting_memproofs"
+    { disabled: { reason: "never_started" } },
+    "app status is never_started"
   );
 
   const response = await appWs.provideMemproofs({});
@@ -616,8 +618,9 @@ test("Local Conductor - Receive a signal", async (t) => {
   const { servicesProcess, signalingServerUrl } = await runLocalServices();
   let signalHandler: AppSignalCb | undefined;
   const signalReceived = new Promise<AppSignal>((resolve) => {
-    signalHandler = (signal) => {
-      resolve(signal);
+    signalHandler = (signal: Signal) => {
+      assert(SignalType.App in signal);
+      resolve(signal[SignalType.App]);
     };
   });
   const conductor = await createConductor(signalingServerUrl);