remove knowledge of mounts from config

index.js

@@ -5,6 +5,7 @@ const os = require('os')
 const mkdirp = require('mkdirp')
 const logger = require('./logger')
 const crypto = require('cobox-crypto')
+const constants = require('cobox-constants')
 
 const CONFIG_FILE = 'config.yml'
 const IDENTITY_SUBKEY_ID = 0
@@ -27,9 +28,8 @@ const logfile = [new Date().toISOString().replace(/:/g, '-').replace(/\./, '-'),
 
 class CoBoxConfig {
   constructor (storage, opts = {}) {
-    this.root = storage || path.join(os.homedir(), '.cobox')
+    this.root = storage || constants.storage
     this.storage = path.join(this.root, CONFIG_FILE)
-    opts.mount = opts.mount || '/cobox'
     this._opts = opts
 
     mkdirp.sync(path.join(this.root, 'logs'))

package.json

@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "cobox-crypto": "git+https://ledger-git.dyne.org/cobox/cobox-crypto",
+    "cobox-constants": "git+https://ledger-git.dyne.org/cobox/cobox-constants",
     "debug": "^4.1.1",
     "js-yaml": "^3.13.1",
     "mkdirp": "^0.5.1",

test/index.test.js

@@ -56,172 +56,3 @@ describe('master_key', (context) => {
     cleanup(storage, next)
   })
 })
-
-describe('options', (context) => {
-  var storage
-
-  context.beforeEach((c) => {
-    storage = tmp()
-  })
-
-  context.afterEach((c) => {
-    cleanup(storage.root)
-  })
-
-  context('get', (assert, next) => {
-    var config = Config(storage)
-    assert.same(config.options.get('mount'), '/cobox', 'mount defaults to /cobox')
-    next()
-  })
-
-  context('set', (assert, next) => {
-    var config = Config(storage)
-    config.options.set('mount', './mnt')
-    assert.same(config._options['mount'], './mnt', 'sets mount option to ./mnt')
-    config.save()
-    config.load()
-    assert.same(config.options.get('mount'), './mnt', 'saved options')
-    next()
-  })
-
-  context('custom', (assert, next) => {
-    var config = Config(storage, { mount: '/tmp' })
-    assert.same(config.options.get('mount'), '/tmp', 'mount defaults to /tmp')
-    next()
-  })
-})
-
-describe('set', (context) => {
-  var storage
-
-  context.beforeEach((c) => {
-    storage = tmp()
-  })
-
-  context.afterEach((c) => {
-    cleanup(storage)
-  })
-
-  context('byKey', (assert, next) => {
-    var config = Config(storage)
-    var group = crypto.unpack(crypto.accessKey())
-
-    config.groups.set(group.address, group)
-
-    config.save()
-
-    var reload = yaml.safeLoad(fs.readFileSync(path.join(storage, 'config.yml')))
-    var rawGroup = reload.groups.byKey[group.address.toString('hex')]
-
-    assert.same(config.groups.get(group.address), rawGroup, 'saves groups to storage')
-    next()
-  })
-
-  context('byName', (assert, next) => {
-    var config = Config(storage)
-    var group = Object.assign({ name: 'group-a' }, crypto.unpack(crypto.accessKey()))
-
-    config.groups.set(group.address, group)
-
-    config.save()
-
-    var reload = yaml.safeLoad(fs.readFileSync(path.join(storage, 'config.yml')))
-    var rawGroup = reload.groups.byKey[group.address.toString('hex')]
-
-    assert.ok(rawGroup.name, 'saves group with a name')
-    assert.same(config.groups.get(group.name), rawGroup, 'gets the group using a name')
-
-    var reload = Config(storage)
-
-    assert.same(reload._groups, config._groups, 'load groups from storage')
-    next()
-  })
-})
-
-describe('get', (context) => {
-  var storage
-
-  context.beforeEach((c) => {
-    storage = tmp()
-  })
-
-  context.afterEach((c) => {
-    cleanup(storage)
-  })
-
-  context('works with buffers or strings', (assert, next) => {
-    var config = Config(storage)
-    var group = crypto.unpack(crypto.accessKey())
-
-    config.groups.set(group.address, group)
-
-    config.save()
-
-    assert.ok(config.groups.get(group.address), 'get group works with a buffer')
-    assert.ok(config.groups.get(group.address.toString('hex')), 'get group works with a hex')
-
-    next()
-  })
-})
-
-describe('del', (context) => {
-  var storage
-
-  context.beforeEach((c) => {
-    storage = tmp()
-  })
-
-  context.afterEach((c) => {
-    cleanup(storage)
-  })
-
-  context('deletes relevant entry using buffers', (assert, next) => {
-    var config = Config(storage)
-    var group = crypto.unpack(crypto.accessKey())
-
-    config.groups.set(group.address, group)
-
-    config.save()
-    config.load()
-
-    config.groups.delete(group.address)
-
-    assert.same(config.groups.list(), [], 'deleted the group')
-    next()
-  })
-
-  context('deletes relevant entry using buffers', (assert, next) => {
-    var config = Config(storage)
-    var group = crypto.unpack(crypto.accessKey())
-
-    config.groups.set(group.address, group)
-
-    config.save()
-    config.load()
-
-    config.groups.delete(group.address.toString('hex'))
-
-    assert.same(config.groups.list(), [], 'deleted the group')
-    next()
-  })
-
-  context('deletes relevant entry using names', (assert, next) => {
-    var config = Config(storage)
-    var group = Object.assign({ name: 'group-a' }, crypto.unpack(crypto.accessKey()))
-
-    config.groups.set(group.address, group)
-
-    config.save()
-    config.load()
-
-    assert.same(config.groups.list().length, 1, 'saved the group')
-
-    config.groups.delete(group.name)
-
-    config.save()
-    config.load()
-
-    assert.same(config.groups.list(), [], 'deleted the group')
-    next()
-  })
-})

test/key-handler.test.js

@@ -0,0 +1,143 @@
+const { describe } = require('tape-plus')
+const Config = require('../')
+const crypto = require('cobox-crypto')
+const fs = require('fs')
+const path = require('path')
+const yaml = require('js-yaml')
+
+const { tmp, cleanup } = require('./util')
+
+describe('set', (context) => {
+  var storage
+
+  context.beforeEach((c) => {
+    storage = tmp()
+  })
+
+  context.afterEach((c) => {
+    cleanup(storage)
+  })
+
+  context('byKey', (assert, next) => {
+    var config = Config(storage)
+    var group = crypto.unpack(crypto.accessKey())
+
+    config.groups.set(group.address, group)
+
+    config.save()
+
+    var reload = yaml.safeLoad(fs.readFileSync(path.join(storage, 'config.yml')))
+    var rawGroup = reload.groups.byKey[group.address.toString('hex')]
+
+    assert.same(config.groups.get(group.address), rawGroup, 'saves groups to storage')
+    next()
+  })
+
+  context('byName', (assert, next) => {
+    var config = Config(storage)
+    var group = Object.assign({ name: 'group-a' }, crypto.unpack(crypto.accessKey()))
+
+    config.groups.set(group.address, group)
+
+    config.save()
+
+    var reload = yaml.safeLoad(fs.readFileSync(path.join(storage, 'config.yml')))
+    var rawGroup = reload.groups.byKey[group.address.toString('hex')]
+
+    assert.ok(rawGroup.name, 'saves group with a name')
+    assert.same(config.groups.get(group.name), rawGroup, 'gets the group using a name')
+
+    var reload = Config(storage)
+
+    assert.same(reload._groups, config._groups, 'load groups from storage')
+    next()
+  })
+})
+
+describe('get', (context) => {
+  var storage
+
+  context.beforeEach((c) => {
+    storage = tmp()
+  })
+
+  context.afterEach((c) => {
+    cleanup(storage)
+  })
+
+  context('works with buffers or strings', (assert, next) => {
+    var config = Config(storage)
+    var group = crypto.unpack(crypto.accessKey())
+
+    config.groups.set(group.address, group)
+
+    config.save()
+
+    assert.ok(config.groups.get(group.address), 'get group works with a buffer')
+    assert.ok(config.groups.get(group.address.toString('hex')), 'get group works with a hex')
+
+    next()
+  })
+})
+
+describe('del', (context) => {
+  var storage
+
+  context.beforeEach((c) => {
+    storage = tmp()
+  })
+
+  context.afterEach((c) => {
+    cleanup(storage)
+  })
+
+  context('deletes relevant entry using buffers', (assert, next) => {
+    var config = Config(storage)
+    var group = crypto.unpack(crypto.accessKey())
+
+    config.groups.set(group.address, group)
+
+    config.save()
+    config.load()
+
+    config.groups.delete(group.address)
+
+    assert.same(config.groups.list(), [], 'deleted the group')
+    next()
+  })
+
+  context('deletes relevant entry using buffers', (assert, next) => {
+    var config = Config(storage)
+    var group = crypto.unpack(crypto.accessKey())
+
+    config.groups.set(group.address, group)
+
+    config.save()
+    config.load()
+
+    config.groups.delete(group.address.toString('hex'))
+
+    assert.same(config.groups.list(), [], 'deleted the group')
+    next()
+  })
+
+  context('deletes relevant entry using names', (assert, next) => {
+    var config = Config(storage)
+    var group = Object.assign({ name: 'group-a' }, crypto.unpack(crypto.accessKey()))
+
+    config.groups.set(group.address, group)
+
+    config.save()
+    config.load()
+
+    assert.same(config.groups.list().length, 1, 'saved the group')
+
+    config.groups.delete(group.name)
+
+    config.save()
+    config.load()
+
+    assert.same(config.groups.list(), [], 'deleted the group')
+    next()
+  })
+})