refactoring: removed default connector and persistence, new code style, proper jsdocs, enabled typechecking

2018-10-29 21:58:21 +01:00
parent fe038822a3
commit e1ece6dc66
84 changed files with 3479 additions and 2580 deletions
--- a/test/DeleteStore.tests.js
+++ b/test/DeleteStore.tests.js
@@ -1,16 +1,16 @@
-import { test } from '../node_modules/cutest/cutest.js'
-import Chance from 'chance'
+import { test } from '../node_modules/cutest/cutest.mjs'
+import * as random from '../lib/random/random.js'
 import DeleteStore from '../src/Store/DeleteStore.js'
-import ID from '../src/Util/ID/ID.js'
+import * as ID from '../src/Util/ID.js'

 /**
 * Converts a DS to an array of length 10.
 *
 * @example
 * const ds = new DeleteStore()
- * ds.mark(new ID(0, 0), 1, false)
- * ds.mark(new ID(0, 1), 1, true)
- * ds.mark(new ID(0, 3), 1, false)
+ * ds.mark(ID.createID(0, 0), 1, false)
+ * ds.mark(ID.createID(0, 1), 1, true)
+ * ds.mark(ID.createID(0, 3), 1, false)
 * dsToArray(ds) // => [0, 1, undefined, 0]
 *
 * @return {Array<(undefined|number)>} Array of numbers indicating if array[i] is deleted (0), garbage collected (1), or undeleted (undefined).
@@ -32,32 +32,32 @@ function dsToArray (ds) {

 test('DeleteStore', async function ds1 (t) {
  const ds = new DeleteStore()
-  ds.mark(new ID(0, 1), 1, false)
-  ds.mark(new ID(0, 2), 1, false)
-  ds.mark(new ID(0, 3), 1, false)
+  ds.mark(ID.createID(0, 1), 1, false)
+  ds.mark(ID.createID(0, 2), 1, false)
+  ds.mark(ID.createID(0, 3), 1, false)
  t.compare(dsToArray(ds), [null, 0, 0, 0])
-  ds.mark(new ID(0, 2), 1, true)
+  ds.mark(ID.createID(0, 2), 1, true)
  t.compare(dsToArray(ds), [null, 0, 1, 0])
-  ds.mark(new ID(0, 1), 1, true)
+  ds.mark(ID.createID(0, 1), 1, true)
  t.compare(dsToArray(ds), [null, 1, 1, 0])
-  ds.mark(new ID(0, 3), 1, true)
+  ds.mark(ID.createID(0, 3), 1, true)
  t.compare(dsToArray(ds), [null, 1, 1, 1])
-  ds.mark(new ID(0, 5), 1, true)
-  ds.mark(new ID(0, 4), 1, true)
+  ds.mark(ID.createID(0, 5), 1, true)
+  ds.mark(ID.createID(0, 4), 1, true)
  t.compare(dsToArray(ds), [null, 1, 1, 1, 1, 1])
-  ds.mark(new ID(0, 0), 3, false)
+  ds.mark(ID.createID(0, 0), 3, false)
  t.compare(dsToArray(ds), [0, 0, 0, 1, 1, 1])
 })

 test('random DeleteStore tests', async function randomDS (t) {
-  const chance = new Chance(t.getSeed() * 1000000000)
+  const prng = random.createPRNG(t.getSeed())
  const ds = new DeleteStore()
  const dsArray = []
  for (let i = 0; i < 200; i++) {
-    const pos = chance.integer({ min: 0, max: 10 })
-    const len = chance.integer({ min: 0, max: 4 })
-    const gc = chance.bool()
-    ds.mark(new ID(0, pos), len, gc)
+    const pos = random.int32(prng, 0, 10)
+    const len = random.int32(prng, 0, 4)
+    const gc = random.bool(prng)
+    ds.mark(ID.createID(0, pos), len, gc)
    for (let j = 0; j < len; j++) {
      dsArray[pos + j] = gc ? 1 : 0
    }
--- a/test/diff.tests.js
+++ b/test/diff.tests.js
@@ -1,6 +1,6 @@
-import { test } from '../node_modules/cutest/cutest.js'
+import { test } from '../node_modules/cutest/cutest.mjs'
 import simpleDiff from '../lib/simpleDiff.js'
-import Chance from 'chance'
+import * as random from '../lib/random/random.js'

 function runDiffTest (t, a, b, expected) {
  let result = simpleDiff(a, b)
@@ -19,9 +19,9 @@ test('diff tests', async function diff1 (t) {
 })

 test('random diff tests', async function randomDiff (t) {
-  const chance = new Chance(t.getSeed() * 1000000000)
-  let a = chance.word()
-  let b = chance.word()
+  const gen = random.createPRNG(t.getSeed() * 1000000000)
+  let a = random.word(gen)
+  let b = random.word(gen)
  let change = simpleDiff(a, b)
  let arr = Array.from(a)
  arr.splice(change.pos, change.remove, ...Array.from(change.insert))
--- a/test/encode-decode.tests.js
+++ b/test/encode-decode.tests.js
@@ -1,15 +1,15 @@
-import { test } from '../node_modules/cutest/cutest.js'
-import BinaryEncoder from '../src/Util/Binary/Encoder.js'
-import BinaryDecoder from '../src/Util/Binary/Decoder.js'
+import { test } from '../node_modules/cutest/cutest.mjs'
 import { generateRandomUint32 } from '../src/Util/generateRandomUint32.js'
-import Chance from 'chance'
+import * as encoding from '../lib/encoding.js'
+import * as decoding from '../lib/decoding.js'
+import * as random from '../lib/random/random.js'

 function testEncoding (t, write, read, val) {
-  let encoder = new BinaryEncoder()
+  let encoder = encoding.createEncoder()
  write(encoder, val)
-  let reader = new BinaryDecoder(encoder.createBuffer())
+  let reader = decoding.createDecoder(encoding.toBuffer(encoder))
  let result = read(reader)
-  t.log(`string encode: ${JSON.stringify(val).length} bytes / binary encode: ${encoder.length} bytes`)
+  t.log(`string encode: ${JSON.stringify(val).length} bytes / binary encode: ${encoding.length(encoder)} bytes`)
  t.compare(val, result, 'Compare results')
 }

@@ -37,8 +37,8 @@ test('varUint of 2839012934', async function varUint2839012934 (t) {
 })

 test('varUint random', async function varUintRandom (t) {
-  const chance = new Chance(t.getSeed() * Math.pow(Number.MAX_SAFE_INTEGER))
-  testEncoding(t, writeVarUint, readVarUint, chance.integer({min: 0, max: (1 << 28) - 1}))
+  const prng = random.createPRNG(t.getSeed() * Math.pow(Number.MAX_SAFE_INTEGER, 2))
+  testEncoding(t, writeVarUint, readVarUint, random.int32(prng, 0, (1 << 28) - 1))
 })

 test('varUint random user id', async function varUintRandomUserId (t) {
@@ -60,6 +60,6 @@ test('varString', async function varString (t) {
 })

 test('varString random', async function varStringRandom (t) {
-  const chance = new Chance(t.getSeed() * 1000000000)
-  testEncoding(t, writeVarString, readVarString, chance.string())
+  const prng = random.createPRNG(t.getSeed() * 10000000)
+  testEncoding(t, writeVarString, readVarString, random.utf16String(prng))
 })
--- a/test/index.js
+++ b/test/index.js
@@ -1,3 +1,5 @@
+// TODO: include all tests
+
 import './red-black-tree.js'
 import './y-array.tests.js'
 import './y-text.tests.js'
--- a/test/red-black-tree.js
+++ b/test/red-black-tree.js
@@ -1,7 +1,7 @@
 import RedBlackTree from '../lib/Tree.js'
-import ID from '../src/Util/ID/ID.js'
-import Chance from 'chance'
-import { test, proxyConsole } from 'cutest'
+import * as ID from '../src/Util/ID.js'
+import { test, proxyConsole } from '../node_modules/cutest/cutest.mjs'
+import * as random from '../lib/random/random.js'

 proxyConsole()

@@ -55,28 +55,28 @@ function checkRootNodeIsBlack (t, tree) {

 test('RedBlack Tree', async function redBlackTree (t) {
  let tree = new RedBlackTree()
-  tree.put({_id: new ID(8433, 0)})
-  tree.put({_id: new ID(12844, 0)})
-  tree.put({_id: new ID(1795, 0)})
-  tree.put({_id: new ID(30302, 0)})
-  tree.put({_id: new ID(64287)})
-  tree.delete(new ID(8433, 0))
-  tree.put({_id: new ID(28996)})
-  tree.delete(new ID(64287))
-  tree.put({_id: new ID(22721)})
+  tree.put({_id: ID.createID(8433, 0)})
+  tree.put({_id: ID.createID(12844, 0)})
+  tree.put({_id: ID.createID(1795, 0)})
+  tree.put({_id: ID.createID(30302, 0)})
+  tree.put({_id: ID.createID(64287)})
+  tree.delete(ID.createID(8433, 0))
+  tree.put({_id: ID.createID(28996)})
+  tree.delete(ID.createID(64287))
+  tree.put({_id: ID.createID(22721)})
  checkRootNodeIsBlack(t, tree)
  checkBlackHeightOfSubTreesAreEqual(t, tree)
  checkRedNodesDoNotHaveBlackChildren(t, tree)
 })

-test(`random tests (${numberOfRBTreeTests})`, async function random (t) {
-  let chance = new Chance(t.getSeed() * 1000000000)
+test(`random tests (${numberOfRBTreeTests})`, async function randomRBTree (t) {
+  let prng = random.createPRNG(t.getSeed() * 1000000000)
  let tree = new RedBlackTree()
  let elements = []
  for (var i = 0; i < numberOfRBTreeTests; i++) {
-    if (chance.bool({likelihood: 80})) {
+    if (random.int32(prng, 0, 100) < 80) {
      // 80% chance to insert an element
-      let obj = new ID(chance.integer({min: 0, max: numberOfRBTreeTests}), chance.integer({min: 0, max: 1}))
+      let obj = ID.createID(random.int32(prng, 0, numberOfRBTreeTests), random.int32(prng, 0, 1))
      let nodeExists = tree.find(obj)
      if (nodeExists === null) {
        if (elements.some(e => e.equals(obj))) {
@@ -87,7 +87,7 @@ test(`random tests (${numberOfRBTreeTests})`, async function random (t) {
      }
    } else if (elements.length > 0) {
      // ~20% chance to delete an element
-      var elem = chance.pickone(elements)
+      var elem = random.oneOf(prng, elements)
      elements = elements.filter(function (e) {
        return !e.equals(elem)
      })
@@ -119,7 +119,7 @@ test(`random tests (${numberOfRBTreeTests})`, async function random (t) {
    'Find every object with lower bound search'
  )
  // TEST iteration (with lower bound search)
-  let lowerBound = chance.pickone(elements)
+  let lowerBound = random.oneOf(prng, elements)
  let expectedResults = elements.filter((e, pos) =>
    (lowerBound.lessThan(e) || e.equals(lowerBound)) &&
    elements.indexOf(e) === pos
@@ -151,7 +151,7 @@ test(`random tests (${numberOfRBTreeTests})`, async function random (t) {
    'iterating over a tree without bounds yields the right amount of results'
  )

-  let upperBound = chance.pickone(elements)
+  let upperBound = random.oneOf(prng, elements)
  expectedResults = elements.filter((e, pos) =>
    (e.lessThan(upperBound) || e.equals(upperBound)) &&
    elements.indexOf(e) === pos
@@ -168,8 +168,8 @@ test(`random tests (${numberOfRBTreeTests})`, async function random (t) {
    'iterating over a tree with upper bound yields the right amount of results'
  )

-  upperBound = chance.pickone(elements)
-  lowerBound = chance.pickone(elements)
+  upperBound = random.oneOf(prng, elements)
+  lowerBound = random.oneOf(prng, elements)
  if (upperBound.lessThan(lowerBound)) {
    [lowerBound, upperBound] = [upperBound, lowerBound]
  }
--- a/test/y-array.tests.js
+++ b/test/y-array.tests.js
@@ -1,5 +1,7 @@
-import { wait, initArrays, compareUsers, Y, flushAll, applyRandomTests } from '../tests-lib/helper.js'
+import { initArrays, compareUsers, applyRandomTests } from '../tests-lib/helper.js'
+import * as Y from '../src/index.js'
 import { test, proxyConsole } from 'cutest'
+import * as random from '../lib/random/random.js'

 proxyConsole()
 test('basic spec', async function array0 (t) {
@@ -24,10 +26,10 @@ test('basic spec', async function array0 (t) {
 })

 test('insert three elements, try re-get property', async function array1 (t) {
-  var { users, array0, array1 } = await initArrays(t, { users: 2 })
+  var { testConnector, users, array0, array1 } = initArrays(t, { users: 2 })
  array0.insert(0, [1, 2, 3])
  t.compare(array0.toJSON(), [1, 2, 3], '.toJSON() works')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  t.compare(array1.toJSON(), [1, 2, 3], '.toJSON() works after sync')
  await compareUsers(t, users)
 })
@@ -41,9 +43,9 @@ test('concurrent insert (handle three conflicts)', async function array2 (t) {
 })

 test('concurrent insert&delete (handle three conflicts)', async function array3 (t) {
-  var { users, array0, array1, array2 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, array0, array1, array2 } = await initArrays(t, { users: 3 })
  array0.insert(0, ['x', 'y', 'z'])
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  array0.insert(1, [0])
  array1.delete(0)
  array1.delete(1, 1)
@@ -53,56 +55,52 @@ test('concurrent insert&delete (handle three conflicts)', async function array3
 })

 test('insertions work in late sync', async function array4 (t) {
-  var { users, array0, array1, array2 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, array0, array1, array2 } = await initArrays(t, { users: 3 })
  array0.insert(0, ['x', 'y'])
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  users[1].disconnect()
  users[2].disconnect()
  array0.insert(1, ['user0'])
  array1.insert(1, ['user1'])
  array2.insert(1, ['user2'])
-  await users[1].reconnect()
-  await users[2].reconnect()
+  await users[1].connect()
+  await users[2].connect()
  await compareUsers(t, users)
 })

 test('disconnect really prevents sending messages', async function array5 (t) {
-  var { users, array0, array1 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, array0, array1 } = await initArrays(t, { users: 3 })
  array0.insert(0, ['x', 'y'])
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  users[1].disconnect()
  users[2].disconnect()
  array0.insert(1, ['user0'])
  array1.insert(1, ['user1'])
-  await wait(1000)
  t.compare(array0.toJSON(), ['x', 'user0', 'y'])
  t.compare(array1.toJSON(), ['x', 'user1', 'y'])
-  await users[1].reconnect()
-  await users[2].reconnect()
+  await users[1].connect()
+  await users[2].connect()
  await compareUsers(t, users)
 })

 test('deletions in late sync', async function array6 (t) {
-  var { users, array0, array1 } = await initArrays(t, { users: 2 })
+  var { testConnector, users, array0, array1 } = await initArrays(t, { users: 2 })
  array0.insert(0, ['x', 'y'])
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  await users[1].disconnect()
  array1.delete(1, 1)
  array0.delete(0, 2)
-  await wait()
-  await users[1].reconnect()
+  await users[1].connect()
  await compareUsers(t, users)
 })

 test('insert, then marge delete on sync', async function array7 (t) {
-  var { users, array0, array1 } = await initArrays(t, { users: 2 })
+  var { testConnector, users, array0, array1 } = await initArrays(t, { users: 2 })
  array0.insert(0, ['x', 'y', 'z'])
-  await flushAll(t, users)
-  await wait()
-  await users[0].disconnect()
+  testConnector.flushAllMessages()
+  users[0].disconnect()
  array1.delete(0, 3)
-  await wait()
-  await users[0].reconnect()
+  users[0].connect()
  await compareUsers(t, users)
 })

@@ -174,14 +172,13 @@ test('insert & delete events for types (2)', async function array10 (t) {
 })

 test('garbage collector', async function gc1 (t) {
-  var { users, array0 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, array0 } = await initArrays(t, { users: 3 })
  array0.insert(0, ['x', 'y', 'z'])
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  users[0].disconnect()
  array0.delete(0, 3)
-  await wait()
-  await users[0].reconnect()
-  await flushAll(t, users)
+  await users[0].connect()
+  testConnector.flushAllMessages()
  await compareUsers(t, users)
 })

@@ -197,13 +194,13 @@ test('event target is set correctly (local)', async function array11 (t) {
 })

 test('event target is set correctly (remote user)', async function array12 (t) {
-  let { array0, array1, users } = await initArrays(t, { users: 3 })
+  let { testConnector, array0, array1, users } = await initArrays(t, { users: 3 })
  var event
  array0.observe(function (e) {
    event = e
  })
  array1.insert(0, ['stuff'])
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  compareEvent(t, event, {
    remote: true
  })
@@ -217,45 +214,45 @@ function getUniqueNumber () {
 }

 var arrayTransactions = [
-  function insert (t, user, chance) {
+  function insert (t, user, prng) {
    const yarray = user.get('array', Y.Array)
    var uniqueNumber = getUniqueNumber()
    var content = []
-    var len = chance.integer({ min: 1, max: 4 })
+    var len = random.int32(prng, 1, 4)
    for (var i = 0; i < len; i++) {
      content.push(uniqueNumber)
    }
-    var pos = chance.integer({ min: 0, max: yarray.length })
+    var pos = random.int32(prng, 0, yarray.length)
    yarray.insert(pos, content)
  },
-  function insertTypeArray (t, user, chance) {
+  function insertTypeArray (t, user, prng) {
    const yarray = user.get('array', Y.Array)
-    var pos = chance.integer({ min: 0, max: yarray.length })
+    var pos = random.int32(prng, 0, yarray.length)
    yarray.insert(pos, [Y.Array])
    var array2 = yarray.get(pos)
    array2.insert(0, [1, 2, 3, 4])
  },
-  function insertTypeMap (t, user, chance) {
+  function insertTypeMap (t, user, prng) {
    const yarray = user.get('array', Y.Array)
-    var pos = chance.integer({ min: 0, max: yarray.length })
+    var pos = random.int32(prng, 0, yarray.length)
    yarray.insert(pos, [Y.Map])
    var map = yarray.get(pos)
    map.set('someprop', 42)
    map.set('someprop', 43)
    map.set('someprop', 44)
  },
-  function _delete (t, user, chance) {
+  function _delete (t, user, prng) {
    const yarray = user.get('array', Y.Array)
    var length = yarray.length
    if (length > 0) {
-      var somePos = chance.integer({ min: 0, max: length - 1 })
-      var delLength = chance.integer({ min: 1, max: Math.min(2, length - somePos) })
+      var somePos = random.int32(prng, 0, length - 1)
+      var delLength = random.int32(prng, 1, Math.min(2, length - somePos))
      if (yarray instanceof Y.Array) {
-        if (chance.bool()) {
+        if (random.bool(prng)) {
          var type = yarray.get(somePos)
          if (type.length > 0) {
-            somePos = chance.integer({ min: 0, max: type.length - 1 })
-            delLength = chance.integer({ min: 0, max: Math.min(2, type.length - somePos) })
+            somePos = random.int32(prng, 0, type.length - 1)
+            delLength = random.int32(prng, 0, Math.min(2, type.length - somePos))
            type.delete(somePos, delLength)
          }
        } else {
--- a/test/y-map.tests.js
+++ b/test/y-map.tests.js
@@ -1,10 +1,12 @@
-import { initArrays, compareUsers, Y, flushAll, applyRandomTests } from '../tests-lib/helper.js'
+import { initArrays, compareUsers, applyRandomTests } from '../tests-lib/helper.js'
+import * as Y from '../src/index.js'
 import { test, proxyConsole } from 'cutest'
+import * as random from '../lib/random/random.js'

 proxyConsole()

 test('basic map tests', async function map0 (t) {
-  let { users, map0, map1, map2 } = await initArrays(t, { users: 3 })
+  let { testConnector, users, map0, map1, map2 } = await initArrays(t, { users: 3 })
  users[2].disconnect()

  map0.set('number', 1)
@@ -22,8 +24,8 @@ test('basic map tests', async function map0 (t) {
  t.compare(map0.get('object'), { key: { key2: 'value' } }, 'client 0 computed the change (object)')
  t.assert(map0.get('y-map').get('y-array').get(0) === -1, 'client 0 computed the change (type)')

-  await users[2].reconnect()
-  await flushAll(t, users)
+  await users[2].connect()
+  testConnector.flushAllMessages()

  t.assert(map1.get('number') === 1, 'client 1 received the update (number)')
  t.assert(map1.get('string') === 'hello Y', 'client 1 received the update (string)')
@@ -39,13 +41,13 @@ test('basic map tests', async function map0 (t) {
 })

 test('Basic get&set of Map property (converge via sync)', async function map1 (t) {
-  let { users, map0 } = await initArrays(t, { users: 2 })
+  let { testConnector, users, map0 } = await initArrays(t, { users: 2 })
  map0.set('stuff', 'stuffy')
  map0.set('undefined', undefined)
  map0.set('null', null)
  t.compare(map0.get('stuff'), 'stuffy')

-  await flushAll(t, users)
+  testConnector.flushAllMessages()

  for (let user of users) {
    var u = user.get('map', Y.Map)
@@ -85,11 +87,11 @@ test('Map can set custom types (Array)', async function map4 (t) {
 })

 test('Basic get&set of Map property (converge via update)', async function map5 (t) {
-  let { users, map0 } = await initArrays(t, { users: 2 })
+  let { testConnector, users, map0 } = await initArrays(t, { users: 2 })
  map0.set('stuff', 'stuffy')
  t.compare(map0.get('stuff'), 'stuffy')

-  await flushAll(t, users)
+  testConnector.flushAllMessages()

  for (let user of users) {
    var u = user.get('map', Y.Map)
@@ -99,12 +101,11 @@ test('Basic get&set of Map property (converge via update)', async function map5
 })

 test('Basic get&set of Map property (handle conflict)', async function map6 (t) {
-  let { users, map0, map1 } = await initArrays(t, { users: 3 })
+  let { testConnector, users, map0, map1 } = await initArrays(t, { users: 3 })
  map0.set('stuff', 'c0')
  map1.set('stuff', 'c1')

-  await flushAll(t, users)
-  await flushAll(t, users)
+  testConnector.flushAllMessages()

  for (let user of users) {
    var u = user.get('map', Y.Map)
@@ -114,12 +115,11 @@ test('Basic get&set of Map property (handle conflict)', async function map6 (t)
 })

 test('Basic get&set&delete of Map property (handle conflict)', async function map7 (t) {
-  let { users, map0, map1 } = await initArrays(t, { users: 3 })
+  let { testConnector, users, map0, map1 } = await initArrays(t, { users: 3 })
  map0.set('stuff', 'c0')
  map0.delete('stuff')
  map1.set('stuff', 'c1')
-  await flushAll(t, users)
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  for (let user of users) {
    var u = user.get('map', Y.Map)
    t.assert(u.get('stuff') === undefined)
@@ -128,13 +128,12 @@ test('Basic get&set&delete of Map property (handle conflict)', async function ma
 })

 test('Basic get&set of Map property (handle three conflicts)', async function map8 (t) {
-  let { users, map0, map1, map2 } = await initArrays(t, { users: 3 })
+  let { testConnector, users, map0, map1, map2 } = await initArrays(t, { users: 3 })
  map0.set('stuff', 'c0')
  map1.set('stuff', 'c1')
  map1.set('stuff', 'c2')
  map2.set('stuff', 'c3')
-  await flushAll(t, users)
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  for (let user of users) {
    var u = user.get('map', Y.Map)
    t.compare(u.get('stuff'), 'c0')
@@ -143,19 +142,18 @@ test('Basic get&set of Map property (handle three conflicts)', async function ma
 })

 test('Basic get&set&delete of Map property (handle three conflicts)', async function map9 (t) {
-  let { users, map0, map1, map2, map3 } = await initArrays(t, { users: 4 })
+  let { testConnector, users, map0, map1, map2, map3 } = await initArrays(t, { users: 4 })
  map0.set('stuff', 'c0')
  map1.set('stuff', 'c1')
  map1.set('stuff', 'c2')
  map2.set('stuff', 'c3')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  map0.set('stuff', 'deleteme')
  map0.delete('stuff')
  map1.set('stuff', 'c1')
  map2.set('stuff', 'c2')
  map3.set('stuff', 'c3')
-  await flushAll(t, users)
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  for (let user of users) {
    var u = user.get('map', Y.Map)
    t.assert(u.get('stuff') === undefined)
@@ -173,7 +171,7 @@ test('observePath properties', async function map10 (t) {
    }
  })
  map1.set('map', new Y.Map())
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  map = map2.get('map')
  t.compare(map.get('yay'), 4)
  await compareUsers(t, users)
@@ -181,7 +179,7 @@ test('observePath properties', async function map10 (t) {
 */

 test('observe deep properties', async function map11 (t) {
-  let { users, map1, map2, map3 } = await initArrays(t, { users: 4 })
+  let { testConnector, users, map1, map2, map3 } = await initArrays(t, { users: 4 })
  var _map1 = map1.set('map', new Y.Map())
  var calls = 0
  var dmapid
@@ -194,15 +192,13 @@ test('observe deep properties', async function map11 (t) {
      dmapid = event.target.get('deepmap')._id
    })
  })
-  await flushAll(t, users)
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  var _map3 = map3.get('map')
  _map3.set('deepmap', new Y.Map())
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  var _map2 = map2.get('map')
  _map2.set('deepmap', new Y.Map())
-  await flushAll(t, users)
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  var dmap1 = _map1.get('deepmap')
  var dmap2 = _map2.get('deepmap')
  var dmap3 = _map3.get('deepmap')
@@ -304,14 +300,14 @@ test('event has correct value when setting a primitive on a YMap (received from
 */

 var mapTransactions = [
-  function set (t, user, chance) {
-    let key = chance.pickone(['one', 'two'])
-    var value = chance.string()
+  function set (t, user, prng) {
+    let key = random.oneOf(prng, ['one', 'two'])
+    var value = random.utf16String(prng)
    user.get('map', Y.Map).set(key, value)
  },
-  function setType (t, user, chance) {
-    let key = chance.pickone(['one', 'two'])
-    var type = chance.pickone([new Y.Array(), new Y.Map()])
+  function setType (t, user, prng) {
+    let key = random.oneOf(prng, ['one', 'two'])
+    var type = random.oneOf(prng, [new Y.Array(), new Y.Map()])
    user.get('map', Y.Map).set(key, type)
    if (type instanceof Y.Array) {
      type.insert(0, [1, 2, 3, 4])
@@ -319,8 +315,8 @@ var mapTransactions = [
      type.set('deepkey', 'deepvalue')
    }
  },
-  function _delete (t, user, chance) {
-    let key = chance.pickone(['one', 'two'])
+  function _delete (t, user, prng) {
+    let key = random.oneOf(prng, ['one', 'two'])
    user.get('map', Y.Map).delete(key)
  }
 ]
--- a/test/y-text.tests.js
+++ b/test/y-text.tests.js
@@ -1,4 +1,4 @@
-import { initArrays, compareUsers, flushAll } from '../tests-lib/helper.js'
+import { initArrays, compareUsers } from '../tests-lib/helper.js'
 import { test, proxyConsole } from 'cutest'

 proxyConsole()
@@ -64,23 +64,23 @@ test('basic format', async function text1 (t) {
 })

 test('quill issue 1', async function quill1 (t) {
-  let { users, quill0 } = await initArrays(t, { users: 2 })
+  let { testConnector, users, quill0 } = await initArrays(t, { users: 2 })
  quill0.insertText(0, 'x')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  quill0.insertText(1, '\n', 'list', 'ordered')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  quill0.insertText(1, '\n', 'list', 'ordered')
  await compareUsers(t, users)
 })

 test('quill issue 2', async function quill2 (t) {
-  let { users, quill0, text0 } = await initArrays(t, { users: 2 })
+  let { testConnector, users, quill0, text0 } = await initArrays(t, { users: 2 })
  let delta
  text0.observe(function (event) {
    delta = event.delta
  })
  quill0.insertText(0, 'abc', 'bold', true)
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  quill0.insertText(1, 'x')
  quill0.update()
  t.compare(delta, [{ retain: 1 }, { insert: 'x', attributes: { bold: true } }])
--- a/test/y-xml.tests.js
+++ b/test/y-xml.tests.js
@@ -1,19 +1,21 @@
-import { wait, initArrays, compareUsers, Y, flushAll, applyRandomTests } from '../../yjs/tests-lib/helper.js'
+import { initArrays, compareUsers, applyRandomTests } from '../../yjs/tests-lib/helper.js'
 import { test } from 'cutest'
+import * as Y from '../src/index.js'
+import * as random from '../lib/random/random.js'

 test('set property', async function xml0 (t) {
-  var { users, xml0, xml1 } = await initArrays(t, { users: 2 })
+  var { testConnector, users, xml0, xml1 } = await initArrays(t, { users: 2 })
  xml0.setAttribute('height', '10')
  t.assert(xml0.getAttribute('height') === '10', 'Simple set+get works')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  t.assert(xml1.getAttribute('height') === '10', 'Simple set+get works (remote)')
  await compareUsers(t, users)
 })

 test('events', async function xml1 (t) {
-  var { users, xml0, xml1 } = await initArrays(t, { users: 2 })
-  var event
-  var remoteEvent
+  var { testConnector, users, xml0, xml1 } = await initArrays(t, { users: 2 })
+  var event = { attributesChanged: new Set() }
+  var remoteEvent = { attributesChanged: new Set() }
  xml0.observe(function (e) {
    delete e._content
    delete e.nodes
@@ -28,21 +30,21 @@ test('events', async function xml1 (t) {
  })
  xml0.setAttribute('key', 'value')
  t.assert(event.attributesChanged.has('key'), 'YXmlEvent.attributesChanged on updated key')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  t.assert(remoteEvent.attributesChanged.has('key'), 'YXmlEvent.attributesChanged on updated key (remote)')
  // check attributeRemoved
  xml0.removeAttribute('key')
  t.assert(event.attributesChanged.has('key'), 'YXmlEvent.attributesChanged on removed attribute')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  t.assert(remoteEvent.attributesChanged.has('key'), 'YXmlEvent.attributesChanged on removed attribute (remote)')
  xml0.insert(0, [new Y.XmlText('some text')])
  t.assert(event.childListChanged, 'YXmlEvent.childListChanged on inserted element')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  t.assert(remoteEvent.childListChanged, 'YXmlEvent.childListChanged on inserted element (remote)')
  // test childRemoved
  xml0.delete(0)
  t.assert(event.childListChanged, 'YXmlEvent.childListChanged on deleted element')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  t.assert(remoteEvent.childListChanged, 'YXmlEvent.childListChanged on deleted element (remote)')
  await compareUsers(t, users)
 })
@@ -50,13 +52,10 @@ test('events', async function xml1 (t) {
 test('attribute modifications (y -> dom)', async function xml2 (t) {
  var { users, xml0, dom0 } = await initArrays(t, { users: 3 })
  xml0.setAttribute('height', '100px')
-  await wait()
  t.assert(dom0.getAttribute('height') === '100px', 'setAttribute')
  xml0.removeAttribute('height')
-  await wait()
  t.assert(dom0.getAttribute('height') == null, 'removeAttribute')
  xml0.setAttribute('class', 'stuffy stuff')
-  await wait()
  t.assert(dom0.getAttribute('class') === 'stuffy stuff', 'set class attribute')
  await compareUsers(t, users)
 })
@@ -64,13 +63,10 @@ test('attribute modifications (y -> dom)', async function xml2 (t) {
 test('attribute modifications (dom -> y)', async function xml3 (t) {
  var { users, xml0, dom0 } = await initArrays(t, { users: 3 })
  dom0.setAttribute('height', '100px')
-  await wait()
  t.assert(xml0.getAttribute('height') === '100px', 'setAttribute')
  dom0.removeAttribute('height')
-  await wait()
  t.assert(xml0.getAttribute('height') == null, 'removeAttribute')
  dom0.setAttribute('class', 'stuffy stuff')
-  await wait()
  t.assert(xml0.getAttribute('class') === 'stuffy stuff', 'set class attribute')
  await compareUsers(t, users)
 })
@@ -79,7 +75,6 @@ test('element insert (dom -> y)', async function xml4 (t) {
  var { users, xml0, dom0 } = await initArrays(t, { users: 3 })
  dom0.insertBefore(document.createTextNode('some text'), null)
  dom0.insertBefore(document.createElement('p'), null)
-  await wait()
  t.assert(xml0.get(0).toString() === 'some text', 'Retrieve Text Node')
  t.assert(xml0.get(1).nodeName === 'P', 'Retrieve Element node')
  await compareUsers(t, users)
@@ -97,10 +92,8 @@ test('element insert (y -> dom)', async function xml5 (t) {
 test('y on insert, then delete (dom -> y)', async function xml6 (t) {
  var { users, xml0, dom0 } = await initArrays(t, { users: 3 })
  dom0.insertBefore(document.createElement('p'), null)
-  await wait()
  t.assert(xml0.length === 1, 'one node present')
  dom0.childNodes[0].remove()
-  await wait()
  t.assert(xml0.length === 0, 'no node present after delete')
  await compareUsers(t, users)
 })
@@ -117,9 +110,7 @@ test('y on insert, then delete (y -> dom)', async function xml7 (t) {
 test('delete consecutive (1) (Text)', async function xml8 (t) {
  var { users, xml0, dom0 } = await initArrays(t, { users: 3 })
  xml0.insert(0, [new Y.XmlText('1'), new Y.XmlText('2'), new Y.XmlText('3')])
-  await wait()
  xml0.delete(1, 2)
-  await wait()
  t.assert(xml0.length === 1, 'check length (y)')
  t.assert(dom0.childNodes.length === 1, 'check length (dom)')
  t.assert(dom0.childNodes[0].textContent === '1', 'check content')
@@ -129,10 +120,8 @@ test('delete consecutive (1) (Text)', async function xml8 (t) {
 test('delete consecutive (2) (Text)', async function xml9 (t) {
  var { users, xml0, dom0 } = await initArrays(t, { users: 3 })
  xml0.insert(0, [new Y.XmlText('1'), new Y.XmlText('2'), new Y.XmlText('3')])
-  await wait()
  xml0.delete(0, 1)
  xml0.delete(1, 1)
-  await wait()
  t.assert(xml0.length === 1, 'check length (y)')
  t.assert(dom0.childNodes.length === 1, 'check length (dom)')
  t.assert(dom0.childNodes[0].textContent === '2', 'check content')
@@ -142,9 +131,7 @@ test('delete consecutive (2) (Text)', async function xml9 (t) {
 test('delete consecutive (1) (Element)', async function xml10 (t) {
  var { users, xml0, dom0 } = await initArrays(t, { users: 3 })
  xml0.insert(0, [new Y.XmlElement('A'), new Y.XmlElement('B'), new Y.XmlElement('C')])
-  await wait()
  xml0.delete(1, 2)
-  await wait()
  t.assert(xml0.length === 1, 'check length (y)')
  t.assert(dom0.childNodes.length === 1, 'check length (dom)')
  t.assert(dom0.childNodes[0].nodeName === 'A', 'check content')
@@ -154,10 +141,8 @@ test('delete consecutive (1) (Element)', async function xml10 (t) {
 test('delete consecutive (2) (Element)', async function xml11 (t) {
  var { users, xml0, dom0 } = await initArrays(t, { users: 3 })
  xml0.insert(0, [new Y.XmlElement('A'), new Y.XmlElement('B'), new Y.XmlElement('C')])
-  await wait()
  xml0.delete(0, 1)
  xml0.delete(1, 1)
-  await wait()
  t.assert(xml0.length === 1, 'check length (y)')
  t.assert(dom0.childNodes.length === 1, 'check length (dom)')
  t.assert(dom0.childNodes[0].nodeName === 'B', 'check content')
@@ -165,12 +150,12 @@ test('delete consecutive (2) (Element)', async function xml11 (t) {
 })

 test('Receive a bunch of elements (with disconnect)', async function xml12 (t) {
-  var { users, xml0, xml1, dom0, dom1 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, xml0, xml1, dom0, dom1 } = await initArrays(t, { users: 3 })
  users[1].disconnect()
  xml0.insert(0, [new Y.XmlElement('A'), new Y.XmlElement('B'), new Y.XmlElement('C')])
  xml0.insert(0, [new Y.XmlElement('X'), new Y.XmlElement('Y'), new Y.XmlElement('Z')])
-  await users[1].reconnect()
-  await flushAll(t, users)
+  await users[1].connect()
+  testConnector.flushAllMessages()
  t.assert(xml0.length === 6, 'check length (y)')
  t.assert(xml1.length === 6, 'check length (y) (reconnected user)')
  t.assert(dom0.childNodes.length === 6, 'check length (dom)')
@@ -179,10 +164,10 @@ test('Receive a bunch of elements (with disconnect)', async function xml12 (t) {
 })

 test('move element to a different position', async function xml13 (t) {
-  var { users, dom0, dom1 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, dom0, dom1 } = await initArrays(t, { users: 3 })
  dom0.append(document.createElement('div'))
  dom0.append(document.createElement('h1'))
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  dom1.insertBefore(dom1.childNodes[0], null)
  t.assert(dom1.childNodes[0].nodeName === 'H1', 'div was deleted (user 0)')
  t.assert(dom1.childNodes[1].nodeName === 'DIV', 'div was moved to the correct position (user 0)')
@@ -192,7 +177,7 @@ test('move element to a different position', async function xml13 (t) {
 })

 test('filter node', async function xml14 (t) {
-  var { users, dom0, dom1, domBinding0, domBinding1 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, dom0, dom1, domBinding0, domBinding1 } = await initArrays(t, { users: 3 })
  let domFilter = (nodeName, attrs) => {
    if (nodeName === 'H1') {
      return null
@@ -204,14 +189,14 @@ test('filter node', async function xml14 (t) {
  domBinding1.setFilter(domFilter)
  dom0.append(document.createElement('div'))
  dom0.append(document.createElement('h1'))
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  t.assert(dom1.childNodes.length === 1, 'Only one node was not transmitted')
  t.assert(dom1.childNodes[0].nodeName === 'DIV', 'div node was transmitted')
  await compareUsers(t, users)
 })

 test('filter attribute', async function xml15 (t) {
-  var { users, dom0, dom1, domBinding0, domBinding1 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, dom0, dom1, domBinding0, domBinding1 } = await initArrays(t, { users: 3 })
  let domFilter = (nodeName, attrs) => {
    attrs.delete('hidden')
    return attrs
@@ -221,7 +206,7 @@ test('filter attribute', async function xml15 (t) {
  dom0.setAttribute('hidden', 'true')
  dom0.setAttribute('style', 'height: 30px')
  dom0.setAttribute('data-me', '77')
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  t.assert(dom0.getAttribute('hidden') === 'true', 'User 0 still has the attribute')
  t.assert(dom1.getAttribute('hidden') == null, 'User 1 did not receive update')
  t.assert(dom1.getAttribute('style') === 'height: 30px', 'User 1 received style update')
@@ -230,7 +215,7 @@ test('filter attribute', async function xml15 (t) {
 })

 test('deep element insert', async function xml16 (t) {
-  var { users, dom0, dom1 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, dom0, dom1 } = await initArrays(t, { users: 3 })
  let deepElement = document.createElement('p')
  let boldElement = document.createElement('b')
  let attrElement = document.createElement('img')
@@ -240,7 +225,7 @@ test('deep element insert', async function xml16 (t) {
  deepElement.append(attrElement)
  dom0.append(deepElement)
  let str0 = dom0.outerHTML
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  let str1 = dom1.outerHTML
  t.compare(str0, str1, 'Dom string representation matches')
  await compareUsers(t, users)
@@ -268,7 +253,7 @@ test('treeWalker', async function xml17 (t) {
 * Incoming changes that contain malicious attributes should be deleted.
 */
 test('Filtering remote changes', async function xmlFilteringRemote (t) {
-  var { users, xml0, xml1, domBinding0 } = await initArrays(t, { users: 3 })
+  var { testConnector, users, xml0, xml1, domBinding0 } = await initArrays(t, { users: 3 })
  domBinding0.setFilter(function (nodeName, attributes) {
    attributes.delete('malicious')
    if (nodeName === 'HIDEME') {
@@ -290,70 +275,71 @@ test('Filtering remote changes', async function xmlFilteringRemote (t) {
  let tag2 = new Y.XmlElement('tag')
  tag2.setAttribute('isHidden', 'true')
  paragraph.insert(0, [tag2])
-  await flushAll(t, users)
+  testConnector.flushAllMessages()
  // check dom
  domBinding0.typeToDom.get(paragraph).setAttribute('malicious', 'true')
  domBinding0.typeToDom.get(span).setAttribute('malicious', 'true')
  // check incoming attributes
  xml1.get(0).get(0).setAttribute('malicious', 'true')
  xml1.insert(0, [new Y.XmlElement('hideMe')])
-  await flushAll(t, users)
+  testConnector.flushAllMessages()

  await compareUsers(t, users)
 })

 // TODO: move elements
 var xmlTransactions = [
-  function attributeChange (t, user, chance) {
-    user.dom.setAttribute(chance.word(), chance.word())
+  function attributeChange (t, user, prng) {
+    // random.word generates non-empty words. prepend something
+    user.dom.setAttribute('_' + random.word(prng), random.word(prng))
  },
-  function attributeChangeHidden (t, user, chance) {
-    user.dom.setAttribute('hidden', chance.word())
+  function attributeChangeHidden (t, user, prng) {
+    user.dom.setAttribute('hidden', random.word(prng))
  },
-  function insertText (t, user, chance) {
+  function insertText (t, user, prng) {
    let dom = user.dom
-    var succ = dom.children.length > 0 ? chance.pickone(dom.children) : null
-    dom.insertBefore(document.createTextNode(chance.word()), succ)
+    var succ = dom.children.length > 0 ? random.oneOf(prng, dom.children) : null
+    dom.insertBefore(document.createTextNode(random.word(prng)), succ)
  },
-  function insertHiddenDom (t, user, chance) {
+  function insertHiddenDom (t, user, prng) {
    let dom = user.dom
-    var succ = dom.children.length > 0 ? chance.pickone(dom.children) : null
+    var succ = dom.children.length > 0 ? random.oneOf(prng, dom.children) : null
    dom.insertBefore(document.createElement('hidden'), succ)
  },
-  function insertDom (t, user, chance) {
+  function insertDom (t, user, prng) {
    let dom = user.dom
-    var succ = dom.children.length > 0 ? chance.pickone(dom.children) : null
-    dom.insertBefore(document.createElement(chance.word()), succ)
+    var succ = dom.children.length > 0 ? random.oneOf(prng, dom.children) : null
+    dom.insertBefore(document.createElement('my-' + random.word(prng)), succ)
  },
-  function deleteChild (t, user, chance) {
+  function deleteChild (t, user, prng) {
    let dom = user.dom
    if (dom.childNodes.length > 0) {
-      var d = chance.pickone(dom.childNodes)
+      var d = random.oneOf(prng, dom.childNodes)
      d.remove()
    }
  },
-  function insertTextSecondLayer (t, user, chance) {
+  function insertTextSecondLayer (t, user, prng) {
    let dom = user.dom
    if (dom.children.length > 0) {
-      let dom2 = chance.pickone(dom.children)
-      let succ = dom2.childNodes.length > 0 ? chance.pickone(dom2.childNodes) : null
-      dom2.insertBefore(document.createTextNode(chance.word()), succ)
+      let dom2 = random.oneOf(prng, dom.children)
+      let succ = dom2.childNodes.length > 0 ? random.oneOf(prng, dom2.childNodes) : null
+      dom2.insertBefore(document.createTextNode(random.word(prng)), succ)
    }
  },
-  function insertDomSecondLayer (t, user, chance) {
+  function insertDomSecondLayer (t, user, prng) {
    let dom = user.dom
    if (dom.children.length > 0) {
-      let dom2 = chance.pickone(dom.children)
-      let succ = dom2.childNodes.length > 0 ? chance.pickone(dom2.childNodes) : null
-      dom2.insertBefore(document.createElement(chance.word()), succ)
+      let dom2 = random.oneOf(prng, dom.children)
+      let succ = dom2.childNodes.length > 0 ? random.oneOf(prng, dom2.childNodes) : null
+      dom2.insertBefore(document.createElement('my-' + random.word(prng)), succ)
    }
  },
-  function deleteChildSecondLayer (t, user, chance) {
+  function deleteChildSecondLayer (t, user, prng) {
    let dom = user.dom
    if (dom.children.length > 0) {
-      let dom2 = chance.pickone(dom.children)
+      let dom2 = random.oneOf(prng, dom.children)
      if (dom2.childNodes.length > 0) {
-        let d = chance.pickone(dom2.childNodes)
+        let d = random.oneOf(prng, dom2.childNodes)
        d.remove()
      }
    }