fix tests and add devices

index.js

@@ -20,7 +20,8 @@ const MapHandler = require('./lib/map-handler')
 const defaultConfig = (options = {}) => ({
   options,
   groups: { byKey: {}, byName: {} },
-  replicators: { byKey: {}, byName: {} }
+  replicators: { byKey: {}, byName: {} },
+  devices: { byKey: {}, byName: {} }
 })
 
 // filename-safe date (probably there is a better way to do this)
@@ -40,6 +41,7 @@ class CoBoxConfig {
       fs.writeFileSync(this.storage, yaml.safeDump(defaultConfig(), { sortKeys: true }))
       this._groups = config.groups
       this._replicators = config.replicators
+      this._devices = config.devices
       this._options = config.options
     } else {
       this.load()
@@ -50,11 +52,12 @@ class CoBoxConfig {
 
     this.deriveKeyPair = crypto.keyPair.bind(null, parentKey)
     this.identity = crypto.keyPair(parentKey, IDENTITY_SUBKEY_ID)
-
     this.logger = logger(path.join(this.root, 'logs', logfile))
     this.log = this.logger('cobox-config')
+
     this.groups = KeyHandler(this._groups)
     this.replicators = KeyHandler(this._replicators)
+    this.devices = KeyHandler(this._devices)
     this.options = MapHandler(this._options)
   }
 
@@ -63,6 +66,7 @@ class CoBoxConfig {
       var config = defaultConfig()
       config.groups = this._groups
       config.replicators = this._replicators
+      config.devices = this._devices
       config.options = this._options
 
       fs.writeFileSync(this.storage, yaml.safeDump(config, { sortKeys: true }))
@@ -78,6 +82,7 @@ class CoBoxConfig {
       const config = yaml.safeLoad(fs.readFileSync(this.storage, 'utf8'))
       this._groups = config.groups
       this._replicators = config.replicators
+      this._devices = config.devices
       this._options = config.options
       return true
     } catch (err) {

package.json

@@ -21,6 +21,7 @@
   "devDependencies": {
     "hypercore-crypto": "^1.0.0",
     "nyc": "^14.1.1",
+    "random-words": "^1.1.0",
     "rimraf": "^2.6.3",
     "tap-spec": "^5.0.0",
     "tape": "^4.11.0",

test/index.test.js

@@ -21,9 +21,9 @@ describe('load', (context) => {
   context('default', (assert, next) => {
     var storage = tmp()
     var config = Config(storage)
-    assert.ok(config.groups instanceof KeyHandler, 'groups uses KeyHandler')
-    assert.ok(config.replicators instanceof KeyHandler, 'replicators uses KeyHandler')
-    assert.ok(config.devices instanceof KeyHandler, 'devices uses KeyHandler')
+    assert.ok(config.groups.list() instanceof Array, 'groups uses KeyHandler')
+    assert.ok(config.replicators.list() instanceof Array, 'replicators uses KeyHandler')
+    assert.ok(config.devices.list() instanceof Array, 'devices uses KeyHandler')
     cleanup(storage, next)
   })
 })

test/key-handler.test.js

@@ -4,6 +4,7 @@ const crypto = require('cobox-crypto')
 const fs = require('fs')
 const path = require('path')
 const yaml = require('js-yaml')
+const randomWords = require('random-words')
 
 const { tmp, cleanup } = require('./util')
 
@@ -20,7 +21,10 @@ describe('set', (context) => {
 
   context('byKey', (assert, next) => {
     var config = Config(storage)
-    var group = crypto.unpack(crypto.accessKey())
+    var group = {
+      address: crypto.address(),
+      name: randomWords(1).pop()
+    }
 
     config.groups.set(group.address, group)