cojson 0.13.13 → 0.13.15

package/src/tests/sync.load.test.ts

@@ -74,8 +74,8 @@ describe("loading coValues from server", () => {
         "server -> client | CONTENT ParentGroup header: true new: After: 0 New: 6",
         "client -> server | KNOWN ParentGroup sessions: header/6",
         "server -> client | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | CONTENT Map header: true new: After: 0 New: 1",
         "client -> server | KNOWN Group sessions: header/5",
+        "server -> client | CONTENT Map header: true new: After: 0 New: 1",
         "client -> server | KNOWN Map sessions: header/1",
       ]
     `);
@@ -118,6 +118,8 @@ describe("loading coValues from server", () => {
         "client -> server | LOAD Map sessions: header/1",
         "server -> client | CONTENT Map header: false new: After: 1 New: 1",
         "client -> server | KNOWN Map sessions: header/2",
+        "server -> client | CONTENT Map header: false new: After: 1 New: 1",
+        "client -> server | KNOWN Map sessions: header/2",
       ]
     `);
   });
@@ -161,9 +163,11 @@ describe("loading coValues from server", () => {
         "server -> client | KNOWN Group sessions: header/5",
         "client -> server | LOAD Map sessions: header/2",
         "server -> client | CONTENT Map header: false new: After: 1 New: 1",
-        "client -> server | KNOWN Map sessions: header/3",
         "client -> server | CONTENT Map header: false new: After: 0 New: 1",
+        "server -> client | CONTENT Map header: false new: After: 1 New: 1",
+        "client -> server | KNOWN Map sessions: header/3",
         "server -> client | KNOWN Map sessions: header/3",
+        "client -> server | KNOWN Map sessions: header/3",
       ]
     `);
   });
@@ -288,36 +292,36 @@ describe("loading coValues from server", () => {
         "server -> client | CONTENT Group header: true new: After: 0 New: 5",
         "client -> server | KNOWN Group sessions: header/5",
         "server -> client | CONTENT Map header: true new: ",
-        "server -> client | CONTENT Map header: false new: After: 0 New: 73",
         "client -> server | KNOWN Map sessions: header/0",
-        "server -> client | CONTENT Map header: false new: After: 73 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 146 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 0 New: 73",
         "client -> server | KNOWN Map sessions: header/73",
-        "server -> client | CONTENT Map header: false new: After: 219 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 292 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 73 New: 73",
         "client -> server | KNOWN Map sessions: header/146",
-        "server -> client | CONTENT Map header: false new: After: 365 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 438 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 146 New: 73",
         "client -> server | KNOWN Map sessions: header/219",
-        "server -> client | CONTENT Map header: false new: After: 511 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 584 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 219 New: 73",
         "client -> server | KNOWN Map sessions: header/292",
-        "server -> client | CONTENT Map header: false new: After: 657 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 730 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 292 New: 73",
         "client -> server | KNOWN Map sessions: header/365",
-        "server -> client | CONTENT Map header: false new: After: 803 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 876 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 365 New: 73",
         "client -> server | KNOWN Map sessions: header/438",
-        "server -> client | CONTENT Map header: false new: After: 949 New: 73",
-        "server -> client | CONTENT Map header: false new: After: 1022 New: 2",
+        "server -> client | CONTENT Map header: false new: After: 438 New: 73",
         "client -> server | KNOWN Map sessions: header/511",
+        "server -> client | CONTENT Map header: false new: After: 511 New: 73",
         "client -> server | KNOWN Map sessions: header/584",
+        "server -> client | CONTENT Map header: false new: After: 584 New: 73",
         "client -> server | KNOWN Map sessions: header/657",
+        "server -> client | CONTENT Map header: false new: After: 657 New: 73",
         "client -> server | KNOWN Map sessions: header/730",
+        "server -> client | CONTENT Map header: false new: After: 730 New: 73",
         "client -> server | KNOWN Map sessions: header/803",
+        "server -> client | CONTENT Map header: false new: After: 803 New: 73",
         "client -> server | KNOWN Map sessions: header/876",
+        "server -> client | CONTENT Map header: false new: After: 876 New: 73",
         "client -> server | KNOWN Map sessions: header/949",
+        "server -> client | CONTENT Map header: false new: After: 949 New: 73",
         "client -> server | KNOWN Map sessions: header/1022",
+        "server -> client | CONTENT Map header: false new: After: 1022 New: 2",
         "client -> server | KNOWN Map sessions: header/1024",
       ]
     `);

package/src/tests/sync.mesh.test.ts

@@ -66,10 +66,10 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
       [
         "edge-france -> core | CONTENT Group header: true new: After: 0 New: 3",
         "core -> edge-france | KNOWN Group sessions: header/3",
-        "core -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "edge-france -> core | CONTENT Map header: true new: After: 0 New: 1",
-        "storage -> core | KNOWN Group sessions: header/3",
+        "core -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "core -> edge-france | KNOWN Map sessions: header/1",
+        "storage -> core | KNOWN Group sessions: header/3",
         "core -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "storage -> core | KNOWN Map sessions: header/1",
         "client -> edge-italy | LOAD Map sessions: empty",
@@ -77,17 +77,16 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "core -> edge-italy | CONTENT Group header: true new: After: 0 New: 3",
         "edge-italy -> core | KNOWN Group sessions: header/3",
         "core -> edge-italy | CONTENT Map header: true new: After: 0 New: 1",
+        "edge-italy -> core | KNOWN Map sessions: header/1",
         "edge-italy -> client | CONTENT Group header: true new: After: 0 New: 3",
         "client -> edge-italy | KNOWN Group sessions: header/3",
-        "edge-italy -> core | KNOWN Map sessions: header/1",
         "edge-italy -> client | CONTENT Map header: true new: After: 0 New: 1",
         "client -> edge-italy | KNOWN Map sessions: header/1",
       ]
     `);
   });
 
-  // FIXME: Expected parent group to be loaded: CoValue co_zEKiodKQprnfsi2qfDtsHGCGDSo not yet loaded
-  test.skip("coValue created on a different edge with parent groups loading", async () => {
+  test("coValue created on a different edge with parent groups loading", async () => {
     const client = setupTestNode();
 
     client.connectToSyncServer({
@@ -96,7 +95,7 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
     });
 
     const group = mesh.edgeFrance.node.createGroup();
-    const parentGroup = mesh.edgeItaly.node.createGroup();
+    const parentGroup = mesh.edgeFrance.node.createGroup();
     parentGroup.addMember("everyone", "reader");
 
     group.extend(parentGroup);
@@ -115,7 +114,36 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         Group: group.core,
         Map: map.core,
       }),
-    ).toMatchInlineSnapshot();
+    ).toMatchInlineSnapshot(`
+      [
+        "edge-france -> core | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "core -> edge-france | KNOWN ParentGroup sessions: header/6",
+        "edge-france -> core | CONTENT Group header: true new: After: 0 New: 5",
+        "core -> storage | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "core -> edge-france | KNOWN Group sessions: header/5",
+        "edge-france -> core | CONTENT Map header: true new: After: 0 New: 1",
+        "storage -> core | KNOWN ParentGroup sessions: header/6",
+        "core -> storage | CONTENT Group header: true new: After: 0 New: 5",
+        "core -> edge-france | KNOWN Map sessions: header/1",
+        "storage -> core | KNOWN Group sessions: header/5",
+        "core -> storage | CONTENT Map header: true new: After: 0 New: 1",
+        "storage -> core | KNOWN Map sessions: header/1",
+        "client -> edge-italy | LOAD Map sessions: empty",
+        "edge-italy -> core | LOAD Map sessions: empty",
+        "core -> edge-italy | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "edge-italy -> core | KNOWN ParentGroup sessions: header/6",
+        "core -> edge-italy | CONTENT Group header: true new: After: 0 New: 5",
+        "edge-italy -> core | KNOWN Group sessions: header/5",
+        "core -> edge-italy | CONTENT Map header: true new: After: 0 New: 1",
+        "edge-italy -> core | KNOWN Map sessions: header/1",
+        "edge-italy -> client | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "client -> edge-italy | KNOWN ParentGroup sessions: header/6",
+        "edge-italy -> client | CONTENT Group header: true new: After: 0 New: 5",
+        "client -> edge-italy | KNOWN Group sessions: header/5",
+        "edge-italy -> client | CONTENT Map header: true new: After: 0 New: 1",
+        "client -> edge-italy | KNOWN Map sessions: header/1",
+      ]
+    `);
   });
 
   test("updating a coValue coming from a different edge", async () => {
@@ -155,8 +183,8 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "edge-italy -> core | CONTENT Map header: false new: After: 0 New: 1",
         "core -> edge-italy | KNOWN Map sessions: header/2",
         "core -> storage | CONTENT Map header: false new: After: 0 New: 1",
-        "storage -> core | KNOWN Map sessions: header/2",
         "core -> edge-france | CONTENT Map header: false new: After: 0 New: 1",
+        "storage -> core | KNOWN Map sessions: header/2",
         "edge-france -> core | KNOWN Map sessions: header/2",
       ]
     `);
@@ -210,29 +238,29 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "edge-italy -> core | CONTENT Group header: true new: After: 0 New: 5",
         "edge-italy -> client | CONTENT Group header: true new: After: 0 New: 5",
         "core -> edge-italy | KNOWN Group sessions: header/5",
-        "client -> edge-italy | KNOWN Group sessions: header/5",
-        "core -> storage | CONTENT Group header: true new: After: 0 New: 5",
         "edge-italy -> core | CONTENT Map header: true new: After: 0 New: 1",
+        "client -> edge-italy | KNOWN Group sessions: header/5",
         "edge-italy -> client | CONTENT Map header: true new: After: 0 New: 1",
-        "storage -> core | KNOWN Group sessions: header/5",
+        "core -> storage | CONTENT Group header: true new: After: 0 New: 5",
         "core -> edge-italy | KNOWN Map sessions: header/1",
-        "core -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "client -> edge-italy | KNOWN Map sessions: header/1",
+        "storage -> core | KNOWN Group sessions: header/5",
+        "core -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "storage -> core | KNOWN Map sessions: header/1",
         "client -> edge-italy | CONTENT Map header: false new: After: 0 New: 1",
         "core -> storage | CONTENT Map header: false new: After: 0 New: 1",
+        "core -> edge-italy | CONTENT Map header: false new: After: 0 New: 1",
         "edge-italy -> client | KNOWN CORRECTION Map sessions: empty",
         "storage -> core | KNOWN Map sessions: header/2",
-        "core -> edge-italy | CONTENT Map header: false new: After: 0 New: 1",
-        "client -> edge-italy | CONTENT Map header: true new: After: 0 New: 1 | After: 0 New: 1",
         "edge-italy -> core | KNOWN CORRECTION Map sessions: empty",
-        "edge-italy -> client | KNOWN Map sessions: header/2",
+        "client -> edge-italy | CONTENT Map header: true new: After: 0 New: 1 | After: 0 New: 1",
         "core -> edge-italy | CONTENT Map header: true new: After: 0 New: 1 | After: 0 New: 1",
-        "edge-italy -> core | CONTENT Map header: false new: After: 0 New: 1",
-        "edge-italy -> client | CONTENT Map header: false new: After: 0 New: 1",
-        "core -> edge-italy | KNOWN Map sessions: header/3",
+        "edge-italy -> client | KNOWN Map sessions: header/2",
         "edge-italy -> core | KNOWN Map sessions: header/3",
+        "edge-italy -> client | CONTENT Map header: false new: After: 0 New: 1",
+        "edge-italy -> core | CONTENT Map header: false new: After: 0 New: 1",
         "client -> edge-italy | KNOWN Map sessions: header/3",
+        "core -> edge-italy | KNOWN Map sessions: header/3",
         "core -> storage | CONTENT Map header: false new: After: 0 New: 1",
         "storage -> core | KNOWN Map sessions: header/3",
       ]

package/src/tests/sync.peerReconciliation.test.ts

@@ -1,18 +1,7 @@
 import { assert, beforeEach, describe, expect, test } from "vitest";
 import { expectMap } from "../coValue";
 import { WasmCrypto } from "../crypto/WasmCrypto";
-import { CoValueCore, RawCoMap } from "../exports";
-import { LocalNode } from "../localNode";
-import { toSimplifiedMessages } from "./messagesTestUtils";
-import {
-  SyncMessagesLog,
-  createTestNode,
-  randomAnonymousAccountAndSessionID,
-  setupTestNode,
-  waitFor,
-} from "./testUtils";
-
-const Crypto = await WasmCrypto.create();
+import { SyncMessagesLog, setupTestNode, waitFor } from "./testUtils";
 
 let jazzCloud = setupTestNode({ isSyncServer: true });
 
@@ -32,8 +21,6 @@ describe("peer reconciliation", () => {
 
     client.connectToSyncServer();
 
-    await new Promise((resolve) => setTimeout(resolve, 100));
-
     await map.core.waitForSync();
 
     expect(
@@ -44,12 +31,12 @@ describe("peer reconciliation", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: empty",
         "client -> server | LOAD Map sessions: header/1",
-        "server -> client | KNOWN Map sessions: empty",
+        "server -> client | KNOWN Group sessions: empty",
         "client -> server | CONTENT Group header: true new: After: 0 New: 3",
-        "server -> client | KNOWN Group sessions: header/3",
+        "server -> client | KNOWN Map sessions: empty",
         "client -> server | CONTENT Map header: true new: After: 0 New: 1",
+        "server -> client | KNOWN Group sessions: header/3",
         "server -> client | KNOWN Map sessions: header/1",
       ]
     `);
@@ -93,10 +80,10 @@ describe("peer reconciliation", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: header/3",
         "client -> server | LOAD Map sessions: header/2",
-        "server -> client | KNOWN Map sessions: header/1",
+        "server -> client | KNOWN Group sessions: header/3",
         "client -> server | CONTENT Map header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Map sessions: header/1",
         "server -> client | KNOWN Map sessions: header/2",
       ]
     `);
@@ -148,10 +135,11 @@ describe("peer reconciliation", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: header/3",
+        "client -> server | LOAD Group sessions: header/3",
         "client -> server | LOAD Map sessions: header/2",
-        "server -> client | KNOWN Map sessions: header/1",
+        "server -> client | KNOWN Group sessions: header/3",
         "client -> server | CONTENT Map header: false new: After: 1 New: 1",
+        "server -> client | KNOWN Map sessions: header/1",
         "server -> client | KNOWN Map sessions: header/2",
       ]
     `);
@@ -191,16 +179,16 @@ describe("peer reconciliation", () => {
     ).toMatchInlineSnapshot(`
       [
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: empty",
         "client -> server | LOAD Map sessions: header/2",
-        "server -> client | KNOWN Map sessions: empty",
+        "server -> client | KNOWN Group sessions: empty",
         "client -> server | CONTENT Group header: true new: After: 0 New: 3",
-        "server -> client | KNOWN Group sessions: header/3",
+        "server -> client | KNOWN Map sessions: empty",
         "client -> server | CONTENT Map header: true new: After: 0 New: 2",
+        "server -> client | KNOWN Group sessions: header/3",
         "server -> client | KNOWN Map sessions: header/2",
         "client -> server | LOAD Group sessions: header/3",
-        "server -> client | KNOWN Group sessions: header/3",
         "client -> server | LOAD Map sessions: header/2",
+        "server -> client | KNOWN Group sessions: header/3",
         "server -> client | KNOWN Map sessions: header/2",
       ]
     `);

package/src/tests/sync.storage.test.ts

@@ -39,11 +39,11 @@ describe("client with storage syncs with server", () => {
         "client -> server | LOAD Map sessions: empty",
         "server -> client | CONTENT Group header: true new: After: 0 New: 3",
         "client -> server | KNOWN Group sessions: header/3",
-        "client -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "server -> client | CONTENT Map header: true new: After: 0 New: 1",
+        "client -> storage | CONTENT Group header: true new: After: 0 New: 3",
+        "client -> server | KNOWN Map sessions: header/1",
         "storage -> client | KNOWN Group sessions: header/3",
         "client -> storage | CONTENT Map header: true new: After: 0 New: 1",
-        "client -> server | KNOWN Map sessions: header/1",
         "storage -> client | KNOWN Map sessions: header/1",
       ]
     `);
@@ -76,10 +76,12 @@ describe("client with storage syncs with server", () => {
         "client -> storage | KNOWN Group sessions: header/3",
         "storage -> client | CONTENT Map header: true new: After: 0 New: 1",
         "client -> server | CONTENT Group header: true new: After: 0 New: 3",
+        "client -> storage | KNOWN Map sessions: header/1",
         "server -> client | KNOWN Group sessions: header/3",
         "client -> server | LOAD Map sessions: header/1",
-        "client -> storage | KNOWN Map sessions: header/1",
         "server -> client | CONTENT Group header: true new: After: 0 New: 3",
+        "client -> server | CONTENT Map header: true new: After: 0 New: 1",
+        "server -> client | KNOWN Map sessions: header/1",
         "client -> server | KNOWN Group sessions: header/3",
         "server -> client | KNOWN Map sessions: header/1",
       ]
@@ -117,16 +119,16 @@ describe("client with storage syncs with server", () => {
         "client -> server | LOAD Map sessions: empty",
         "server -> client | CONTENT ParentGroup header: true new: After: 0 New: 6",
         "client -> server | KNOWN ParentGroup sessions: header/6",
-        "client -> storage | CONTENT ParentGroup header: true new: After: 0 New: 6",
         "server -> client | CONTENT Group header: true new: After: 0 New: 5",
-        "storage -> client | KNOWN ParentGroup sessions: header/6",
+        "client -> storage | CONTENT ParentGroup header: true new: After: 0 New: 6",
+        "client -> server | KNOWN Group sessions: header/5",
         "server -> client | CONTENT Map header: true new: After: 0 New: 1",
+        "storage -> client | KNOWN ParentGroup sessions: header/6",
         "client -> storage | CONTENT Group header: true new: After: 0 New: 5",
+        "client -> server | KNOWN Map sessions: header/1",
         "storage -> client | KNOWN Group sessions: header/5",
-        "client -> server | KNOWN Group sessions: header/5",
         "client -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "storage -> client | KNOWN Map sessions: header/1",
-        "client -> server | KNOWN Map sessions: header/1",
       ]
     `);
   });
@@ -167,7 +169,9 @@ describe("client with storage syncs with server", () => {
         "client -> server | LOAD Map sessions: header/1",
         "server -> client | CONTENT Map header: false new: After: 1 New: 1",
         "client -> server | KNOWN Map sessions: header/2",
+        "server -> client | CONTENT Map header: false new: After: 1 New: 1",
         "client -> storage | CONTENT Map header: false new: After: 1 New: 1",
+        "client -> server | KNOWN Map sessions: header/2",
         "storage -> client | KNOWN Map sessions: header/2",
       ]
     `);
@@ -212,10 +216,10 @@ describe("client syncs with a server with storage", () => {
       [
         "client -> server | CONTENT Group header: true new: After: 0 New: 3",
         "server -> client | KNOWN Group sessions: header/3",
-        "server -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "client -> server | CONTENT Map header: true new: After: 0 New: 1",
-        "storage -> server | KNOWN Group sessions: header/3",
+        "server -> storage | CONTENT Group header: true new: After: 0 New: 3",
         "server -> client | KNOWN Map sessions: header/1",
+        "storage -> server | KNOWN Group sessions: header/3",
         "server -> storage | CONTENT Map header: true new: After: 0 New: 1",
         "storage -> server | KNOWN Map sessions: header/1",
       ]

package/src/tests/sync.test.ts

@@ -31,7 +31,7 @@ beforeEach(async () => {
   });
 });
 
-test("If we add a peer, but it never subscribes to a coValue, it won't get any messages", async () => {
+test("If we add a client peer, but it never subscribes to a coValue, it won't get any messages", async () => {
   const [admin, session] = randomAnonymousAccountAndSessionID();
   const node = new LocalNode(admin, session, Crypto);
 
@@ -47,7 +47,7 @@ test("If we add a peer, but it never subscribes to a coValue, it won't get any m
     id: "test",
     incoming: inRx,
     outgoing: outTx,
-    role: "peer",
+    role: "client",
     crashOnClose: true,
   });
 
@@ -561,7 +561,7 @@ describe("SyncManager - knownStates vs optimisticKnownStates", () => {
     const mapOnClient = group.createMap();
     mapOnClient.set("key1", "value1", "trusting");
 
-    await client.syncManager.actuallySyncCoValue(mapOnClient.core);
+    await client.syncManager.syncCoValue(mapOnClient.core);
 
     // Wait for the full sync to complete
     await mapOnClient.core.waitForSync();
@@ -592,7 +592,7 @@ describe("SyncManager - knownStates vs optimisticKnownStates", () => {
     const map = group.createMap();
     map.set("key1", "value1", "trusting");
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
     await map.core.waitForSync();
 
     // Block the content messages
@@ -604,7 +604,7 @@ describe("SyncManager - knownStates vs optimisticKnownStates", () => {
 
     map.set("key2", "value2", "trusting");
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
 
     expect(peerState.optimisticKnownStates.get(map.core.id)).not.toEqual(
       peerState.knownStates.get(map.core.id),
@@ -636,7 +636,7 @@ describe("SyncManager.addPeer", () => {
     const map = group.createMap();
     map.set("key1", "value1", "trusting");
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
 
     // Wait for initial sync
     await map.core.waitForSync();
@@ -669,7 +669,7 @@ describe("SyncManager.addPeer", () => {
     const map = group.createMap();
     map.set("key1", "value1", "trusting");
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
 
     // Wait for initial sync
     await map.core.waitForSync();
@@ -841,7 +841,7 @@ describe("waitForSyncWithPeer", () => {
     const map = group.createMap();
     map.set("key1", "value1", "trusting");
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
 
     await expect(
       client.node.syncManager.waitForSyncWithPeer(
@@ -866,7 +866,7 @@ describe("waitForSyncWithPeer", () => {
       return Promise.resolve();
     });
 
-    await client.node.syncManager.actuallySyncCoValue(map.core);
+    await client.node.syncManager.syncCoValue(map.core);
 
     await expect(
       client.node.syncManager.waitForSyncWithPeer(
@@ -914,7 +914,7 @@ describe("metrics", () => {
     const node = new LocalNode(admin, session, Crypto);
 
     let connectedPeers = await metricReader.getMetricValue("jazz.peers", {
-      role: "peer",
+      role: "client",
     });
     expect(connectedPeers).toBeUndefined();
     let connectedServerPeers = await metricReader.getMetricValue("jazz.peers", {
@@ -928,12 +928,12 @@ describe("metrics", () => {
       id: "peer-1",
       incoming: inPeer1,
       outgoing: outPeer1,
-      role: "peer",
+      role: "client",
       crashOnClose: false,
     });
 
     connectedPeers = await metricReader.getMetricValue("jazz.peers", {
-      role: "peer",
+      role: "client",
     });
     expect(connectedPeers).toBe(1);
 
@@ -943,12 +943,12 @@ describe("metrics", () => {
       id: "peer-2",
       incoming: inPeer2,
       outgoing: outPeer2,
-      role: "peer",
+      role: "client",
       crashOnClose: false,
     });
 
     connectedPeers = await metricReader.getMetricValue("jazz.peers", {
-      role: "peer",
+      role: "client",
     });
     expect(connectedPeers).toBe(2);
 
@@ -966,7 +966,7 @@ describe("metrics", () => {
     });
     expect(connectedServerPeers).toBe(1);
     connectedPeers = await metricReader.getMetricValue("jazz.peers", {
-      role: "peer",
+      role: "client",
     });
     expect(connectedPeers).toBe(2);
 
@@ -975,7 +975,7 @@ describe("metrics", () => {
     await waitFor(() => node.syncManager.peers["peer-1"]?.closed);
 
     connectedPeers = await metricReader.getMetricValue("jazz.peers", {
-      role: "peer",
+      role: "client",
     });
     expect(connectedPeers).toBe(1);
 
@@ -991,20 +991,6 @@ describe("metrics", () => {
   });
 });
 
-function groupContentEx(group: RawGroup) {
-  return {
-    action: "content",
-    id: group.core.id,
-  };
-}
-
-function groupStateEx(group: RawGroup) {
-  return {
-    action: "known",
-    id: group.core.id,
-  };
-}
-
 describe("LocalNode.load", () => {
   test("should throw error when trying to load with undefined ID", async () => {
     const client = await setupTestAccount();

package/src/tests/sync.upload.test.ts

@@ -169,32 +169,32 @@ describe("client to server upload", () => {
         "client -> server | CONTENT Map header: false new: After: 0 New: 73",
         "server -> client | KNOWN Map sessions: header/73",
         "client -> server | CONTENT Map header: false new: After: 73 New: 73",
-        "client -> server | CONTENT Map header: false new: After: 146 New: 73",
         "server -> client | KNOWN Map sessions: header/146",
-        "client -> server | CONTENT Map header: false new: After: 219 New: 73",
-        "client -> server | CONTENT Map header: false new: After: 292 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 146 New: 73",
         "server -> client | KNOWN Map sessions: header/219",
-        "client -> server | CONTENT Map header: false new: After: 365 New: 73",
-        "client -> server | CONTENT Map header: false new: After: 438 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 219 New: 73",
         "server -> client | KNOWN Map sessions: header/292",
-        "client -> server | CONTENT Map header: false new: After: 511 New: 73",
-        "client -> server | CONTENT Map header: false new: After: 584 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 292 New: 73",
         "server -> client | KNOWN Map sessions: header/365",
-        "client -> server | CONTENT Map header: false new: After: 657 New: 73",
-        "client -> server | CONTENT Map header: false new: After: 730 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 365 New: 73",
         "server -> client | KNOWN Map sessions: header/438",
-        "client -> server | CONTENT Map header: false new: After: 803 New: 73",
-        "client -> server | CONTENT Map header: false new: After: 876 New: 73",
+        "client -> server | CONTENT Map header: false new: After: 438 New: 73",
         "server -> client | KNOWN Map sessions: header/511",
-        "client -> server | CONTENT Map header: false new: After: 949 New: 73",
-        "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
+        "client -> server | CONTENT Map header: false new: After: 511 New: 73",
         "server -> client | KNOWN Map sessions: header/584",
+        "client -> server | CONTENT Map header: false new: After: 584 New: 73",
         "server -> client | KNOWN Map sessions: header/657",
+        "client -> server | CONTENT Map header: false new: After: 657 New: 73",
         "server -> client | KNOWN Map sessions: header/730",
+        "client -> server | CONTENT Map header: false new: After: 730 New: 73",
         "server -> client | KNOWN Map sessions: header/803",
+        "client -> server | CONTENT Map header: false new: After: 803 New: 73",
         "server -> client | KNOWN Map sessions: header/876",
+        "client -> server | CONTENT Map header: false new: After: 876 New: 73",
         "server -> client | KNOWN Map sessions: header/949",
+        "client -> server | CONTENT Map header: false new: After: 949 New: 73",
         "server -> client | KNOWN Map sessions: header/1022",
+        "client -> server | CONTENT Map header: false new: After: 1022 New: 2",
         "server -> client | KNOWN Map sessions: header/1024",
       ]
     `);

package/src/tests/testUtils.ts

@@ -295,6 +295,7 @@ export function blockMessageTypeOnOutgoingPeer(
   });
 
   return {
+    blockedMessages,
     sendBlockedMessages: async () => {
       for (const msg of blockedMessages) {
         await push.call(peer.outgoing, msg);