corestore 6.0.0-alpha.0 → 6.0.0-alpha.1

package/index.js

@@ -15,7 +15,7 @@ module.exports = class Corestore extends EventEmitter {
   constructor (storage, opts = {}) {
     super()
 
-    this.storage = Hypercore.defaultStorage(storage)
+    this.storage = Hypercore.defaultStorage(storage, { lock: KEYS_DIR + '/profile' })
 
     this.cores = opts._cores || new Map()
     this.keys = opts.keys

package/lib/keys.js

@@ -42,18 +42,6 @@ module.exports = class KeyManager {
     return keyPair
   }
 
-  // TODO: Rethink how we can do async signing
-  createNetworkIdentity (name, token) {
-    const keyPair = {
-      publicKey: Buffer.alloc(32),
-      secretKey: Buffer.alloc(64)
-    }
-
-    sodium.crypto_sign_seed_keypair(keyPair.publicKey, keyPair.secretKey, this.createSecret(name, token))
-
-    return keyPair
-  }
-
   static createToken () {
     return randomBytes(32)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corestore",
-  "version": "6.0.0-alpha.0",
+  "version": "6.0.0-alpha.1",
   "description": "A Hypercore factory that simplifies managing collections of cores.",
   "main": "index.js",
   "scripts": {

package/test/all.js

@@ -111,7 +111,7 @@ test('core uncached when all sessions close', async function (t) {
 })
 
 test('writable core loaded from name userData', async function (t) {
-  const dir = await tmp.dir()
+  const dir = await tmp.dir({ unsafeCleanup: true })
 
   let store = new Corestore(dir.path)
   let core = store.get({ name: 'main' })
@@ -133,5 +133,24 @@ test('writable core loaded from name userData', async function (t) {
   t.same(await core.get(0), Buffer.from('hello'))
   t.same(await core.get(1), Buffer.from('world'))
 
+  await dir.cleanup()
+  t.end()
+})
+
+test('storage locking', async function (t) {
+  const dir = await tmp.dir({ unsafeCleanup: true })
+
+  const store1 = new Corestore(dir.path)
+  const store2 = new Corestore(dir.path)
+  await store1.ready()
+
+  try {
+    await store2.ready()
+    t.fail('dir should have been locked')
+  } catch {
+    t.pass('dir was locked')
+  }
+
+  await dir.cleanup()
   t.end()
 })

package/test/keys.js

@@ -19,19 +19,6 @@ test('can create hypercore keypairs', async t => {
   t.end()
 })
 
-test('can create network identities', async t => {
-  const keys = await KeyManager.fromStorage(ram)
-
-  const id1 = await keys.createNetworkIdentity('id1')
-  const id2 = await keys.createNetworkIdentity('id2')
-
-  t.same(id1.publicKey.length, 32)
-  t.same(id2.publicKey.length, 32)
-  t.notSame(id1.publicKey, id2.publicKey)
-
-  t.end()
-})
-
 test('distinct tokens create distinct hypercore keypairs', async t => {
   const keys = await KeyManager.fromStorage(ram)
   const token1 = KeyManager.createToken()
@@ -45,19 +32,6 @@ test('distinct tokens create distinct hypercore keypairs', async t => {
   t.end()
 })
 
-test('distinct tokens create distinct network identities', async t => {
-  const keys = await KeyManager.fromStorage(ram)
-  const token1 = KeyManager.createToken()
-  const token2 = KeyManager.createToken()
-
-  const id1 = await keys.createNetworkIdentity('id1', token1)
-  const id2 = await keys.createNetworkIdentity('id1', token2)
-
-  t.notSame(id1.publicKey, id2.publicKey)
-
-  t.end()
-})
-
 test('short user-provided token will throw', async t => {
   const keys = await KeyManager.fromStorage(ram)