Skip to content

Commit b7d9d51

Browse files
authored
Merge pull request #26 from nunogoncalves03/main
Fix code sample in Syncing and Concurrency section
2 parents b80ce8a + 2cfd538 commit b7d9d51

1 file changed

Lines changed: 15 additions & 8 deletions

File tree

automerge.go

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,25 +120,32 @@ in sync. This wraps an underlying efficient sync protocol to minimize both
120120
round-trips and bandwidth used.
121121
122122
//* process 1 *
123-
syncState, err := automerge.NewSyncState(doc)
123+
syncState := automerge.NewSyncState(doc)
124124
for {
125-
m, valid, err := syncState.GenerateMessage()
125+
m, valid := syncState.GenerateMessage()
126126
if valid {
127-
sendCh <- m
127+
sendCh <- m.Bytes()
128128
}
129+
129130
msg := <-recvCh
130-
err := syncState.ReceiveMessage(msg)
131+
_, err := syncState.ReceiveMessage(msg)
132+
if err != nil {
133+
panic(err)
134+
}
131135
}
132136
133137
//* process 2 *
134-
syncState, err := automerge.NewSyncState(doc)
138+
syncState := automerge.NewSyncState(doc)
135139
for {
136140
msg := <-sendCh
137-
err := syncState.ReceiveMessage(msg)
141+
_, err := syncState.ReceiveMessage(msg)
142+
if err != nil {
143+
panic(err)
144+
}
138145
139-
m, valid, err := syncState.GenerateMessage()
146+
m, valid := syncState.GenerateMessage()
140147
if valid {
141-
recvCh <- m
148+
recvCh <- m.Bytes()
142149
}
143150
}
144151

0 commit comments

Comments
 (0)