fix rebase conflicts

automerge · Jul 26, 2024 · 71a5cd7 · 71a5cd7
1 parent 3836fc7
commit 71a5cd7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/automerge-repo/src/Repo.ts b/packages/automerge-repo/src/Repo.ts
@@ -23,6 +23,10 @@ import { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js
 import { SyncStatePayload } from "./synchronizer/Synchronizer.js"
 import type { AnyDocumentId, DocumentId, PeerId } from "./types.js"
 
+function randomPeerId() {
+  return "peer-" + Math.random().toString(36).slice(4) as PeerId
+}
+
 /** A Repo is a collection of documents with networking, syncing, and storage capabilities. */
 /** The `Repo` is the main entry point of this library
  *
@@ -61,7 +65,7 @@ export class Repo extends EventEmitter<RepoEvents> {
   constructor({
     storage,
     network = [],
-    peerId,
+    peerId = randomPeerId(),
     sharePolicy,
     isEphemeral = storage === undefined,
     enableRemoteHeadsGossiping = false,

diff --git a/packages/automerge-repo/test/Repo.test.ts b/packages/automerge-repo/test/Repo.test.ts
@@ -1263,7 +1263,6 @@ describe("Repo", () => {
     aliceDoc.change((doc: any) => (doc.text = "Hello world"))
 
     const bobDoc = bobRepo.find(aliceDoc.url)
-    bobDoc.unavailable()
     await eventPromise(bobDoc, "unavailable")
 
     aliceAdapter.peerCandidate(bob)