From 5db4251f68b25f4098ecbb91c302725661a73f6c Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Mon, 5 Jul 2021 19:36:56 -0700
Subject: [PATCH 01/43] Ported /auth route to src/controllers/

---
 bin/server.js                                 |  4 +
 .../rest-api}/auth/controller.js              |  6 +-
 src/controllers/rest-api/auth/index.js        | 17 ++++
 src/controllers/rest-api/auth/router.js       | 37 ++++++++
 src/controllers/rest-api/index.js             | 88 +++++++++++++++++++
 src/lib/ipfs.js                               | 13 ++-
 src/modules/auth/router.js                    | 14 ---
 .../{ => temp}/a02-users.rest-e2e.js          |  0
 .../{ => temp}/a04-contact.rest-e2e.js        |  0
 .../{ => temp}/a06-logapi.rest-e2e.js         |  0
 .../{ => temp}/a08-validators.rest-e2e.js     |  0
 .../{ => temp}/a09-admin.rest-e2e.js          |  0
 12 files changed, 158 insertions(+), 21 deletions(-)
 rename src/{modules => controllers/rest-api}/auth/controller.js (94%)
 create mode 100644 src/controllers/rest-api/auth/index.js
 create mode 100644 src/controllers/rest-api/auth/router.js
 create mode 100644 src/controllers/rest-api/index.js
 delete mode 100644 src/modules/auth/router.js
 rename test/e2e/automated/{ => temp}/a02-users.rest-e2e.js (100%)
 rename test/e2e/automated/{ => temp}/a04-contact.rest-e2e.js (100%)
 rename test/e2e/automated/{ => temp}/a06-logapi.rest-e2e.js (100%)
 rename test/e2e/automated/{ => temp}/a08-validators.rest-e2e.js (100%)
 rename test/e2e/automated/{ => temp}/a09-admin.rest-e2e.js (100%)

diff --git a/bin/server.js b/bin/server.js
index 01facf3..a89d1b7 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -52,6 +52,10 @@ async function startServer () {
   app.use(passport.initialize())
   app.use(passport.session())
 
+  // Attach boilerplate REST API endpoints.
+  const restApi = require('../src/controllers/rest-api')
+  restApi.attachControllers(app)
+
   // Custom Middleware Modules
   const modules = require('../src/modules')
   modules(app)
diff --git a/src/modules/auth/controller.js b/src/controllers/rest-api/auth/controller.js
similarity index 94%
rename from src/modules/auth/controller.js
rename to src/controllers/rest-api/auth/controller.js
index b888c34..52cdeeb 100644
--- a/src/modules/auth/controller.js
+++ b/src/controllers/rest-api/auth/controller.js
@@ -1,9 +1,9 @@
-const Passport = require('../../lib/passport')
+const Passport = require('../../../lib/passport')
 const passport = new Passport()
 
 let _this
 
-class Auth {
+class AuthRESTController {
   constructor () {
     _this = this
     this.passport = passport
@@ -82,4 +82,4 @@ class Auth {
   }
 }
 
-module.exports = Auth
+module.exports = AuthRESTController
diff --git a/src/controllers/rest-api/auth/index.js b/src/controllers/rest-api/auth/index.js
new file mode 100644
index 0000000..20c769c
--- /dev/null
+++ b/src/controllers/rest-api/auth/index.js
@@ -0,0 +1,17 @@
+/*
+  REST API library for auth route.
+*/
+
+const AuthRESTRouter = require('./router')
+
+class AuthRESTController {
+  constructor (localConfig = {}) {
+    this.authRESTRouter = new AuthRESTRouter()
+  }
+
+  attach (app) {
+    this.authRESTRouter.attachControllers(app)
+  }
+}
+
+module.exports = AuthRESTController
diff --git a/src/controllers/rest-api/auth/router.js b/src/controllers/rest-api/auth/router.js
new file mode 100644
index 0000000..c826321
--- /dev/null
+++ b/src/controllers/rest-api/auth/router.js
@@ -0,0 +1,37 @@
+/*
+  REST Router for the /auth route.
+*/
+
+// Public npm libraries.
+const Router = require('koa-router')
+
+// Local libraries.
+const AuthRESTController = require('./controller')
+
+class AuthRESTRouter {
+  constructor (localConfig = {}) {
+    // Encapsulate dependencies.
+    this.authRESTController = new AuthRESTController()
+
+    // Instantiate the router and set the base route.
+    const baseUrl = '/auth'
+    this.router = new Router({ prefix: baseUrl })
+  }
+
+  attachControllers (app) {
+    if (!app) {
+      throw new Error(
+        'Must pass app object when attached REST API controllers.'
+      )
+    }
+
+    // Define the routes and attach the controller.
+    this.router.post('/', this.authRESTController.authUser)
+
+    // Attach the Controller routes to the Koa app.
+    app.use(this.router.routes())
+    app.use(this.router.allowedMethods())
+  }
+}
+
+module.exports = AuthRESTRouter
diff --git a/src/controllers/rest-api/index.js b/src/controllers/rest-api/index.js
new file mode 100644
index 0000000..11f32d7
--- /dev/null
+++ b/src/controllers/rest-api/index.js
@@ -0,0 +1,88 @@
+/*
+  This index file for the Clean Architecture Controllers loads dependencies,
+  creates instances, and attaches the controller to REST API endpoints for
+  Koa.
+*/
+
+// Public npm libraries.
+
+// Load the REST API Controllers.
+// const EntryRESTController = require('./rest/entry')
+// const WebhookRESTController = require('./rest/webhook')
+// const PostWebhook = require('./rest/post-webhook')
+const AuthRESTController = require('./auth')
+
+// Load the Clean Architecture Adapters library
+// const adapters = require('../adapters')
+
+// Load the JSON RPC Controller.
+// const JSONRPC = require('./json-rpc')
+
+// Load the Clean Architecture Use Case libraries.
+// const UseCases = require('../use-cases')
+// const useCases = new UseCases({ adapters })
+
+// Top-level function for this library.
+// Start the various Controllers and attach them to the app.
+async function attachControllers (app) {
+  // Attach the REST controllers to the Koa app.
+  attachRESTControllers(app)
+
+  // Start the P2WDB.
+  // await adapters.p2wdb.start()
+
+  // Start the P2WDB and attach the validation event handler/controller to
+  // the add-entry Use Case.
+  // await attachValidationController()
+
+  // attachRPCControllers()
+}
+
+function attachRESTControllers (app) {
+  // Attach the REST API Controllers associated with the /auth route
+  const authRESTController = new AuthRESTController()
+  authRESTController.attach(app)
+}
+
+// Add the JSON RPC router to the ipfs-coord adapter.
+// function attachRPCControllers () {
+//   const jsonRpcController = new JSONRPC({ adapters, useCases })
+//
+//   // Attach the input of the JSON RPC router to the output of ipfs-coord.
+//   adapters.p2wdb.ipfsAdapters.ipfsCoordAdapter.attachRPCRouter(
+//     jsonRpcController.router
+//   )
+// }
+
+// Start the P2WDB and its downstream depenencies (IPFS, ipfs-coord, OrbitDB).
+// Also attach the post-validation, peer-replication event handler (controller)
+// to the Add-Entry Use Case.
+// async function attachValidationController () {
+//   try {
+//     // Trigger the addPeerEntry() use-case after a replication-validation event.
+//     adapters.p2wdb.orbit.validationEvent.on(
+//       'ValidationSucceeded',
+//       async function (data) {
+//         try {
+//           // console.log(
+//           //   'ValidationSucceeded event triggering addPeerEntry() with this data: ',
+//           //   data
+//           // )
+//
+//           await useCases.entry.addEntry.addPeerEntry(data)
+//         } catch (err) {
+//           console.error(
+//             'Error trying to process peer data with addPeerEntry(): ',
+//             err
+//           )
+//           // Do not throw an error. This is a top-level function.
+//         }
+//       }
+//     )
+//   } catch (err) {
+//     console.error('Error in controllers/index.js/startP2wdb()')
+//     throw err
+//   }
+// }
+
+module.exports = { attachControllers }
diff --git a/src/lib/ipfs.js b/src/lib/ipfs.js
index 3b87836..897504f 100644
--- a/src/lib/ipfs.js
+++ b/src/lib/ipfs.js
@@ -80,10 +80,15 @@ class IPFSLib {
       // Set the 'server' profile so the node does not scan private networks.
       await this.ipfs.config.profiles.apply('server')
 
-      const nodeConfig = await this.ipfs.config.getAll()
-      console.log(
-        `IPFS node configuration: ${JSON.stringify(nodeConfig, null, 2)}`
-      )
+      // const nodeConfig = await this.ipfs.config.getAll()
+      // console.log(
+      //   `IPFS node configuration: ${JSON.stringify(nodeConfig, null, 2)}`
+      // )
+
+      // Stop the IPFS node if we're running tests.
+      if (this.config.env === 'test') {
+        await this.ipfs.stop()
+      }
     } catch (err) {
       console.error('Error in startIpfs()')
       throw err
diff --git a/src/modules/auth/router.js b/src/modules/auth/router.js
deleted file mode 100644
index 56cf0e0..0000000
--- a/src/modules/auth/router.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// import * as auth from './controller'
-const CONTROLLER = require('./controller')
-const controller = new CONTROLLER()
-// export const baseUrl = '/auth'
-module.exports.baseUrl = '/auth'
-
-// export default [
-module.exports.routes = [
-  {
-    method: 'POST',
-    route: '/',
-    handlers: [controller.authUser]
-  }
-]
diff --git a/test/e2e/automated/a02-users.rest-e2e.js b/test/e2e/automated/temp/a02-users.rest-e2e.js
similarity index 100%
rename from test/e2e/automated/a02-users.rest-e2e.js
rename to test/e2e/automated/temp/a02-users.rest-e2e.js
diff --git a/test/e2e/automated/a04-contact.rest-e2e.js b/test/e2e/automated/temp/a04-contact.rest-e2e.js
similarity index 100%
rename from test/e2e/automated/a04-contact.rest-e2e.js
rename to test/e2e/automated/temp/a04-contact.rest-e2e.js
diff --git a/test/e2e/automated/a06-logapi.rest-e2e.js b/test/e2e/automated/temp/a06-logapi.rest-e2e.js
similarity index 100%
rename from test/e2e/automated/a06-logapi.rest-e2e.js
rename to test/e2e/automated/temp/a06-logapi.rest-e2e.js
diff --git a/test/e2e/automated/a08-validators.rest-e2e.js b/test/e2e/automated/temp/a08-validators.rest-e2e.js
similarity index 100%
rename from test/e2e/automated/a08-validators.rest-e2e.js
rename to test/e2e/automated/temp/a08-validators.rest-e2e.js
diff --git a/test/e2e/automated/a09-admin.rest-e2e.js b/test/e2e/automated/temp/a09-admin.rest-e2e.js
similarity index 100%
rename from test/e2e/automated/a09-admin.rest-e2e.js
rename to test/e2e/automated/temp/a09-admin.rest-e2e.js

From 61bc01b7838eaa93322cff4129a3a3f1366b74e0 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 12:23:35 -0700
Subject: [PATCH 02/43] ported user route. Still need middleware

---
 src/controllers/rest-api/index.js             |  5 ++
 .../rest-api}/users/controller.js             | 17 ++++---
 src/controllers/rest-api/users/index.js       | 17 +++++++
 src/controllers/rest-api/users/router.js      | 41 +++++++++++++++
 src/modules/users/router.js                   | 50 -------------------
 .../{temp => }/a02-users.rest-e2e.js          |  2 +-
 test/unit/rest-api/a02-users.rest-unit.js     |  2 +-
 7 files changed, 76 insertions(+), 58 deletions(-)
 rename src/{modules => controllers/rest-api}/users/controller.js (96%)
 create mode 100644 src/controllers/rest-api/users/index.js
 create mode 100644 src/controllers/rest-api/users/router.js
 delete mode 100644 src/modules/users/router.js
 rename test/e2e/automated/{temp => }/a02-users.rest-e2e.js (99%)

diff --git a/src/controllers/rest-api/index.js b/src/controllers/rest-api/index.js
index 11f32d7..4bd1e34 100644
--- a/src/controllers/rest-api/index.js
+++ b/src/controllers/rest-api/index.js
@@ -11,6 +11,7 @@
 // const WebhookRESTController = require('./rest/webhook')
 // const PostWebhook = require('./rest/post-webhook')
 const AuthRESTController = require('./auth')
+const UserRESTController = require('./users')
 
 // Load the Clean Architecture Adapters library
 // const adapters = require('../adapters')
@@ -42,6 +43,10 @@ function attachRESTControllers (app) {
   // Attach the REST API Controllers associated with the /auth route
   const authRESTController = new AuthRESTController()
   authRESTController.attach(app)
+
+  // Attach the REST API Controllers associated with the /user route
+  const userRESTController = new UserRESTController()
+  userRESTController.attach(app)
 }
 
 // Add the JSON RPC router to the ipfs-coord adapter.
diff --git a/src/modules/users/controller.js b/src/controllers/rest-api/users/controller.js
similarity index 96%
rename from src/modules/users/controller.js
rename to src/controllers/rest-api/users/controller.js
index 4f569a8..b9d9295 100644
--- a/src/modules/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -1,16 +1,21 @@
+/*
+  REST API Controller library for the /user route
+*/
+
 // User database model.
-const User = require('../../models/users')
+const UserModel = require('../../../models/users')
 
 // User library for business logic.
-const UserLib = require('../../lib/users')
+const UserLib = require('../../../lib/users')
 
-const wlogger = require('../../lib/wlogger')
+const wlogger = require('../../../lib/wlogger')
 
 let _this
-class UserController {
+
+class UserRESTControllerLib {
   constructor () {
     // Encapsulate dependencies
-    this.User = User
+    this.UserModel = UserModel
     this.userLib = new UserLib()
 
     _this = this
@@ -277,4 +282,4 @@ class UserController {
   }
 }
 
-module.exports = UserController
+module.exports = UserRESTControllerLib
diff --git a/src/controllers/rest-api/users/index.js b/src/controllers/rest-api/users/index.js
new file mode 100644
index 0000000..dc94afc
--- /dev/null
+++ b/src/controllers/rest-api/users/index.js
@@ -0,0 +1,17 @@
+/*
+  REST API library for /user route.
+*/
+
+const UserRESTRouter = require('./router')
+
+class UserRESTController {
+  constructor (localConfig = {}) {
+    this.userRESTRouter = new UserRESTRouter()
+  }
+
+  attach (app) {
+    this.userRESTRouter.attachControllers(app)
+  }
+}
+
+module.exports = UserRESTController
diff --git a/src/controllers/rest-api/users/router.js b/src/controllers/rest-api/users/router.js
new file mode 100644
index 0000000..785bd75
--- /dev/null
+++ b/src/controllers/rest-api/users/router.js
@@ -0,0 +1,41 @@
+/*
+  REST Router for the /user route.
+*/
+
+// Public npm libraries.
+const Router = require('koa-router')
+
+// Local libraries.
+const UserRESTControllerLib = require('./controller')
+
+class UserRESTRouter {
+  constructor (localConfig = {}) {
+    // Encapsulate dependencies.
+    this.userRESTController = new UserRESTControllerLib()
+
+    // Instantiate the router and set the base route.
+    const baseUrl = '/users'
+    this.router = new Router({ prefix: baseUrl })
+  }
+
+  attachControllers (app) {
+    if (!app) {
+      throw new Error(
+        'Must pass app object when attaching REST API controllers.'
+      )
+    }
+
+    // Define the routes and attach the controller.
+    this.router.post('/', this.userRESTController.createUser)
+    this.router.get('/', this.userRESTController.getUsers)
+    this.router.get('/:id', this.userRESTController.getUsers)
+    this.router.put('/', this.userRESTController.updateUser)
+    this.router.delete('/', this.userRESTController.deleteUser)
+
+    // Attach the Controller routes to the Koa app.
+    app.use(this.router.routes())
+    app.use(this.router.allowedMethods())
+  }
+}
+
+module.exports = UserRESTRouter
diff --git a/src/modules/users/router.js b/src/modules/users/router.js
deleted file mode 100644
index 20d4869..0000000
--- a/src/modules/users/router.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const VALIDATOR = require('../../middleware/validators')
-const validator = new VALIDATOR()
-
-const CONTROLLER = require('./controller')
-const controller = new CONTROLLER()
-
-// export const baseUrl = '/users'
-module.exports.baseUrl = '/users'
-
-module.exports.routes = [
-  {
-    method: 'POST',
-    route: '/',
-    handlers: [controller.createUser]
-  },
-  {
-    method: 'GET',
-    route: '/',
-    handlers: [
-      validator.ensureUser,
-      controller.getUsers
-    ]
-  },
-  {
-    method: 'GET',
-    route: '/:id',
-    handlers: [
-      validator.ensureUser,
-      controller.getUser
-    ]
-  },
-  {
-    method: 'PUT',
-    route: '/:id',
-    handlers: [
-      validator.ensureTargetUserOrAdmin,
-      controller.getUser,
-      controller.updateUser
-    ]
-  },
-  {
-    method: 'DELETE',
-    route: '/:id',
-    handlers: [
-      validator.ensureTargetUserOrAdmin,
-      controller.getUser,
-      controller.deleteUser
-    ]
-  }
-]
diff --git a/test/e2e/automated/temp/a02-users.rest-e2e.js b/test/e2e/automated/a02-users.rest-e2e.js
similarity index 99%
rename from test/e2e/automated/temp/a02-users.rest-e2e.js
rename to test/e2e/automated/a02-users.rest-e2e.js
index 5ecea89..8fcbef0 100644
--- a/test/e2e/automated/temp/a02-users.rest-e2e.js
+++ b/test/e2e/automated/a02-users.rest-e2e.js
@@ -11,7 +11,7 @@ const LOCALHOST = `http://localhost:${config.port}`
 
 const context = {}
 
-const UserController = require('../../../src/modules/users/controller')
+const UserController = require('../../../src/controllers/rest-api/users/controller')
 let uut
 let sandbox
 
diff --git a/test/unit/rest-api/a02-users.rest-unit.js b/test/unit/rest-api/a02-users.rest-unit.js
index 0ec57b2..ef87e32 100644
--- a/test/unit/rest-api/a02-users.rest-unit.js
+++ b/test/unit/rest-api/a02-users.rest-unit.js
@@ -12,7 +12,7 @@ const config = require('../../../config')
 const testUtils = require('../../utils/test-utils')
 const User = require('../../../src/models/users')
 
-const UserController = require('../../../src/modules/users/controller')
+const UserController = require('../../../src/controllers/rest-api/users/controller')
 let uut
 let sandbox
 let ctx

From 08cf043e37692f740b22066ee08715aab3b36ca6 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 13:16:14 -0700
Subject: [PATCH 03/43] fix(users): Ported users and unit tests REST API to
 controllers dir

---
 src/controllers/rest-api/users/router.js | 36 +++++++++++++++++++++---
 src/middleware/validators.js             | 22 +++++++--------
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/controllers/rest-api/users/router.js b/src/controllers/rest-api/users/router.js
index 785bd75..94f479c 100644
--- a/src/controllers/rest-api/users/router.js
+++ b/src/controllers/rest-api/users/router.js
@@ -7,15 +7,21 @@ const Router = require('koa-router')
 
 // Local libraries.
 const UserRESTControllerLib = require('./controller')
+const Validators = require('../../../middleware/validators')
+
+let _this
 
 class UserRESTRouter {
   constructor (localConfig = {}) {
     // Encapsulate dependencies.
     this.userRESTController = new UserRESTControllerLib()
+    this.validators = new Validators()
 
     // Instantiate the router and set the base route.
     const baseUrl = '/users'
     this.router = new Router({ prefix: baseUrl })
+
+    _this = this
   }
 
   attachControllers (app) {
@@ -27,15 +33,37 @@ class UserRESTRouter {
 
     // Define the routes and attach the controller.
     this.router.post('/', this.userRESTController.createUser)
-    this.router.get('/', this.userRESTController.getUsers)
-    this.router.get('/:id', this.userRESTController.getUsers)
-    this.router.put('/', this.userRESTController.updateUser)
-    this.router.delete('/', this.userRESTController.deleteUser)
+    this.router.get('/', this.getAll)
+    this.router.get('/:id', this.getById)
+    this.router.put('/:id', this.updateUser)
+    this.router.delete('/:id', this.deleteUser)
 
     // Attach the Controller routes to the Koa app.
     app.use(this.router.routes())
     app.use(this.router.allowedMethods())
   }
+
+  async getAll (ctx, next) {
+    await _this.validators.ensureUser(ctx, next)
+    await _this.userRESTController.getUsers(ctx, next)
+  }
+
+  async getById (ctx, next) {
+    await _this.validators.ensureUser(ctx, next)
+    await _this.userRESTController.getUser(ctx, next)
+  }
+
+  async updateUser (ctx, next) {
+    await _this.validators.ensureTargetUserOrAdmin(ctx, next)
+    await _this.userRESTController.getUser(ctx, next)
+    await _this.userRESTController.updateUser(ctx, next)
+  }
+
+  async deleteUser (ctx, next) {
+    await _this.validators.ensureTargetUserOrAdmin(ctx, next)
+    await _this.userRESTController.getUser(ctx, next)
+    await _this.userRESTController.deleteUser(ctx, next)
+  }
 }
 
 module.exports = UserRESTRouter
diff --git a/src/middleware/validators.js b/src/middleware/validators.js
index 10043e4..64d4566 100644
--- a/src/middleware/validators.js
+++ b/src/middleware/validators.js
@@ -26,27 +26,27 @@ class Validators {
       const token = _this.getToken(ctx)
 
       if (!token) {
-      // console.log(`Err: Token not provided.`)
+        // console.log(`Err: Token not provided.`)
         ctx.throw(401)
       }
 
       let decoded = null
       try {
-      // console.log(`token: ${JSON.stringify(token, null, 2)}`)
-      // console.log(`config: ${JSON.stringify(config, null, 2)}`)
+        // console.log(`token: ${JSON.stringify(token, null, 2)}`)
+        // console.log(`config: ${JSON.stringify(config, null, 2)}`)
         decoded = _this.jwt.verify(token, config.token)
       } catch (err) {
-      // console.log(`Err: Token could not be decoded: ${err}`)
+        // console.log(`Err: Token could not be decoded: ${err}`)
         ctx.throw(401)
       }
 
       ctx.state.user = await _this.User.findById(decoded.id, '-password')
       if (!ctx.state.user) {
-      // console.log(`Err: Could not find user.`)
+        // console.log(`Err: Could not find user.`)
         ctx.throw(401)
       }
 
-      return next()
+      // return next()
     } catch (error) {
       ctx.throw(401)
     }
@@ -84,7 +84,7 @@ class Validators {
         ctx.throw(401, 'not admin')
       }
 
-      return next()
+      // return next()
     } catch (error) {
       ctx.throw(401, error.message)
     }
@@ -130,20 +130,18 @@ class Validators {
 
       if (ctx.state.user._id.toString() !== targetId.toString()) {
         wlogger.verbose(
-          `Calling user and target user do not match! Calling user: ${
-            ctx.state.user._id
-          }, Target user: ${targetId}`
+          `Calling user and target user do not match! Calling user: ${ctx.state.user._id}, Target user: ${targetId}`
         )
 
         // If they don't match, then the calling user better be an admin.
         if (ctx.state.user.type !== 'admin') {
           ctx.throw(401, 'not admin')
         } else {
-          wlogger.verbose('It\'s ok. The user is an admin.')
+          wlogger.verbose("It's ok. The user is an admin.")
         }
       }
 
-      return next()
+      // return next()
     } catch (error) {
       ctx.throw(401, error.message)
     }

From 089adfb40f2721e3326d36534329c96ced42d4bc Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 13:59:02 -0700
Subject: [PATCH 04/43] Moved REST validators library

---
 src/{ => controllers/rest-api}/middleware/validators.js | 8 ++++----
 src/controllers/rest-api/users/controller.js            | 9 ---------
 src/controllers/rest-api/users/router.js                | 2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)
 rename src/{ => controllers/rest-api}/middleware/validators.js (95%)

diff --git a/src/middleware/validators.js b/src/controllers/rest-api/middleware/validators.js
similarity index 95%
rename from src/middleware/validators.js
rename to src/controllers/rest-api/middleware/validators.js
index 64d4566..071acb0 100644
--- a/src/middleware/validators.js
+++ b/src/controllers/rest-api/middleware/validators.js
@@ -2,11 +2,11 @@
   REST API validator middleware.
 */
 
-const User = require('../models/users')
-const config = require('../../config')
-const getToken = require('../lib/auth')
+const User = require('../../../models/users')
+const config = require('../../../../config')
+const getToken = require('../../../lib/auth')
 const jwt = require('jsonwebtoken')
-const wlogger = require('../lib/wlogger')
+const wlogger = require('../../../lib/wlogger')
 
 let _this
 
diff --git a/src/controllers/rest-api/users/controller.js b/src/controllers/rest-api/users/controller.js
index b9d9295..aaa51af 100644
--- a/src/controllers/rest-api/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -271,15 +271,6 @@ class UserRESTControllerLib {
       ctx.throw(422, err.message)
     }
   }
-
-  // Validate Email Format
-  async validateEmail (email) {
-    // eslint-disable-next-line no-useless-escape
-    if (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)) {
-      return true
-    }
-    return false
-  }
 }
 
 module.exports = UserRESTControllerLib
diff --git a/src/controllers/rest-api/users/router.js b/src/controllers/rest-api/users/router.js
index 94f479c..58d4df0 100644
--- a/src/controllers/rest-api/users/router.js
+++ b/src/controllers/rest-api/users/router.js
@@ -7,7 +7,7 @@ const Router = require('koa-router')
 
 // Local libraries.
 const UserRESTControllerLib = require('./controller')
-const Validators = require('../../../middleware/validators')
+const Validators = require('../middleware/validators')
 
 let _this
 

From 8a372619951cd580d613e60b7ae830ae2c0e52fd Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 14:33:54 -0700
Subject: [PATCH 05/43] Ported contact REST API route to controllers dir

---
 .../rest-api}/contact/controller.js           |  4 +-
 src/controllers/rest-api/contact/index.js     | 17 ++++++++
 src/controllers/rest-api/contact/router.js    | 43 +++++++++++++++++++
 src/controllers/rest-api/index.js             |  5 +++
 src/modules/contact/router.js                 | 17 --------
 .../{temp => }/a04-contact.rest-e2e.js        |  2 +-
 test/unit/rest-api/a04-contact.rest-api.js    |  5 +--
 7 files changed, 70 insertions(+), 23 deletions(-)
 rename src/{modules => controllers/rest-api}/contact/controller.js (94%)
 create mode 100644 src/controllers/rest-api/contact/index.js
 create mode 100644 src/controllers/rest-api/contact/router.js
 delete mode 100644 src/modules/contact/router.js
 rename test/e2e/automated/{temp => }/a04-contact.rest-e2e.js (98%)

diff --git a/src/modules/contact/controller.js b/src/controllers/rest-api/contact/controller.js
similarity index 94%
rename from src/modules/contact/controller.js
rename to src/controllers/rest-api/contact/controller.js
index 846e66b..b5b94b5 100644
--- a/src/modules/contact/controller.js
+++ b/src/controllers/rest-api/contact/controller.js
@@ -1,11 +1,11 @@
 /*
-  Controller or the /contact REST API endpoints.
+  Controller for the /contact REST API endpoints.
 */
 
 /* eslint-disable no-useless-escape */
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 
-const ContactLib = require('../../lib/contact')
+const ContactLib = require('../../../lib/contact')
 const contactLib = new ContactLib()
 
 let _this
diff --git a/src/controllers/rest-api/contact/index.js b/src/controllers/rest-api/contact/index.js
new file mode 100644
index 0000000..3ea84eb
--- /dev/null
+++ b/src/controllers/rest-api/contact/index.js
@@ -0,0 +1,17 @@
+/*
+  REST API library for /contact route.
+*/
+
+const ContactRESTRouter = require('./router')
+
+class ContactRESTController {
+  constructor (localConfig = {}) {
+    this.contactRESTRouter = new ContactRESTRouter()
+  }
+
+  attach (app) {
+    this.contactRESTRouter.attachControllers(app)
+  }
+}
+
+module.exports = ContactRESTController
diff --git a/src/controllers/rest-api/contact/router.js b/src/controllers/rest-api/contact/router.js
new file mode 100644
index 0000000..02914f9
--- /dev/null
+++ b/src/controllers/rest-api/contact/router.js
@@ -0,0 +1,43 @@
+/*
+  REST Router for the /contact route.
+*/
+
+// Public npm libraries.
+const Router = require('koa-router')
+
+// Local libraries.
+const ContactRESTControllerLib = require('./controller')
+const Validators = require('../middleware/validators')
+
+// let _this
+
+class ContactRESTRouter {
+  constructor (localConfig = {}) {
+    // Encapsulate dependencies.
+    this.contactRESTController = new ContactRESTControllerLib()
+    this.validators = new Validators()
+
+    // Instantiate the router and set the base route.
+    const baseUrl = '/contact'
+    this.router = new Router({ prefix: baseUrl })
+
+    // _this = this
+  }
+
+  attachControllers (app) {
+    if (!app) {
+      throw new Error(
+        'Must pass app object when attaching REST API controllers.'
+      )
+    }
+
+    // Define the routes and attach the controller.
+    this.router.post('/email', this.contactRESTController.email)
+
+    // Attach the Controller routes to the Koa app.
+    app.use(this.router.routes())
+    app.use(this.router.allowedMethods())
+  }
+}
+
+module.exports = ContactRESTRouter
diff --git a/src/controllers/rest-api/index.js b/src/controllers/rest-api/index.js
index 4bd1e34..b0c8628 100644
--- a/src/controllers/rest-api/index.js
+++ b/src/controllers/rest-api/index.js
@@ -12,6 +12,7 @@
 // const PostWebhook = require('./rest/post-webhook')
 const AuthRESTController = require('./auth')
 const UserRESTController = require('./users')
+const ContactRESTController = require('./contact')
 
 // Load the Clean Architecture Adapters library
 // const adapters = require('../adapters')
@@ -47,6 +48,10 @@ function attachRESTControllers (app) {
   // Attach the REST API Controllers associated with the /user route
   const userRESTController = new UserRESTController()
   userRESTController.attach(app)
+
+  // Attach the REST API Controllers associated with the /contact route
+  const contactRESTController = new ContactRESTController()
+  contactRESTController.attach(app)
 }
 
 // Add the JSON RPC router to the ipfs-coord adapter.
diff --git a/src/modules/contact/router.js b/src/modules/contact/router.js
deleted file mode 100644
index 0f0bf3c..0000000
--- a/src/modules/contact/router.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// const ensureUser = require('../../midleware/validators')
-
-const ContactController = require('./controller')
-const contactController = new ContactController()
-
-// export const baseUrl = '/users'
-module.exports.baseUrl = '/contact'
-
-module.exports.routes = [
-  {
-    method: 'POST',
-    route: '/email',
-    handlers: [
-      contactController.email
-    ]
-  }
-]
diff --git a/test/e2e/automated/temp/a04-contact.rest-e2e.js b/test/e2e/automated/a04-contact.rest-e2e.js
similarity index 98%
rename from test/e2e/automated/temp/a04-contact.rest-e2e.js
rename to test/e2e/automated/a04-contact.rest-e2e.js
index bfc72ca..4d28cde 100644
--- a/test/e2e/automated/temp/a04-contact.rest-e2e.js
+++ b/test/e2e/automated/a04-contact.rest-e2e.js
@@ -9,7 +9,7 @@ const sinon = require('sinon')
 const LOCALHOST = `http://localhost:${config.port}`
 
 const mockContext = require('../../unit/mocks/ctx-mock').context
-const ContactController = require('../../../src/modules/contact/controller')
+const ContactController = require('../../../src/controllers/rest-api/contact/controller')
 let uut
 let sandbox
 
diff --git a/test/unit/rest-api/a04-contact.rest-api.js b/test/unit/rest-api/a04-contact.rest-api.js
index 874634c..e8c721d 100644
--- a/test/unit/rest-api/a04-contact.rest-api.js
+++ b/test/unit/rest-api/a04-contact.rest-api.js
@@ -6,7 +6,7 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const ContactController = require('../../../src/modules/contact/controller')
+const ContactController = require('../../../src/controllers/rest-api/contact/controller')
 let uut
 let sandbox
 let ctx
@@ -14,8 +14,7 @@ let ctx
 const mockContext = require('../../unit/mocks/ctx-mock').context
 
 describe('Contact', () => {
-  before(async () => {
-  })
+  before(async () => {})
 
   beforeEach(() => {
     uut = new ContactController()

From ada35eb092d6b0f56c85f03b796ed2429ee0e5b3 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 14:47:43 -0700
Subject: [PATCH 06/43] feat(modules): Removed src/modules folder. Ported all
 REST API to /src/controllers/ folder

---
 bin/server.js                                 |  4 +-
 src/controllers/rest-api/index.js             |  5 ++
 .../rest-api/logs}/controller.js              |  3 +-
 src/controllers/rest-api/logs/index.js        | 17 ++++++
 src/controllers/rest-api/logs/router.js       | 43 +++++++++++++++
 src/modules/index.js                          | 55 -------------------
 src/modules/logapi/router.js                  | 35 ------------
 .../{temp => }/a06-logapi.rest-e2e.js         | 16 ++++--
 test/unit/rest-api/a06-logapi.rest-unit.js    |  9 +--
 9 files changed, 84 insertions(+), 103 deletions(-)
 rename src/{modules/logapi => controllers/rest-api/logs}/controller.js (97%)
 create mode 100644 src/controllers/rest-api/logs/index.js
 create mode 100644 src/controllers/rest-api/logs/router.js
 delete mode 100644 src/modules/index.js
 delete mode 100644 src/modules/logapi/router.js
 rename test/e2e/automated/{temp => }/a06-logapi.rest-e2e.js (90%)

diff --git a/bin/server.js b/bin/server.js
index a89d1b7..bf0c733 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -57,8 +57,8 @@ async function startServer () {
   restApi.attachControllers(app)
 
   // Custom Middleware Modules
-  const modules = require('../src/modules')
-  modules(app)
+  // const modules = require('../src/modules')
+  // modules(app)
 
   // Enable CORS for testing
   // THIS IS A SECURITY RISK. COMMENT OUT FOR PRODUCTION
diff --git a/src/controllers/rest-api/index.js b/src/controllers/rest-api/index.js
index b0c8628..ba933bc 100644
--- a/src/controllers/rest-api/index.js
+++ b/src/controllers/rest-api/index.js
@@ -13,6 +13,7 @@
 const AuthRESTController = require('./auth')
 const UserRESTController = require('./users')
 const ContactRESTController = require('./contact')
+const LogsRESTController = require('./logs')
 
 // Load the Clean Architecture Adapters library
 // const adapters = require('../adapters')
@@ -52,6 +53,10 @@ function attachRESTControllers (app) {
   // Attach the REST API Controllers associated with the /contact route
   const contactRESTController = new ContactRESTController()
   contactRESTController.attach(app)
+
+  // Attach the REST API Controllers associated with the /logs route
+  const logsRESTController = new LogsRESTController()
+  logsRESTController.attach(app)
 }
 
 // Add the JSON RPC router to the ipfs-coord adapter.
diff --git a/src/modules/logapi/controller.js b/src/controllers/rest-api/logs/controller.js
similarity index 97%
rename from src/modules/logapi/controller.js
rename to src/controllers/rest-api/logs/controller.js
index 97346dd..2e5d710 100644
--- a/src/modules/logapi/controller.js
+++ b/src/controllers/rest-api/logs/controller.js
@@ -1,5 +1,4 @@
-
-const LogsApiLib = require('../../lib/logapi')
+const LogsApiLib = require('../../../lib/logapi')
 const logsApiLib = new LogsApiLib()
 let _this
 
diff --git a/src/controllers/rest-api/logs/index.js b/src/controllers/rest-api/logs/index.js
new file mode 100644
index 0000000..c8544c2
--- /dev/null
+++ b/src/controllers/rest-api/logs/index.js
@@ -0,0 +1,17 @@
+/*
+  REST API library for /logs route.
+*/
+
+const LogsRESTRouter = require('./router')
+
+class LogsRESTController {
+  constructor (localConfig = {}) {
+    this.logsRESTRouter = new LogsRESTRouter()
+  }
+
+  attach (app) {
+    this.logsRESTRouter.attachControllers(app)
+  }
+}
+
+module.exports = LogsRESTController
diff --git a/src/controllers/rest-api/logs/router.js b/src/controllers/rest-api/logs/router.js
new file mode 100644
index 0000000..d4b1ccf
--- /dev/null
+++ b/src/controllers/rest-api/logs/router.js
@@ -0,0 +1,43 @@
+/*
+  REST Router for the /logs route.
+*/
+
+// Public npm libraries.
+const Router = require('koa-router')
+
+// Local libraries.
+const LogsRESTControllerLib = require('./controller')
+const Validators = require('../middleware/validators')
+
+// let _this
+
+class LogsRESTRouter {
+  constructor (localConfig = {}) {
+    // Encapsulate dependencies.
+    this.logsRESTController = new LogsRESTControllerLib()
+    this.validators = new Validators()
+
+    // Instantiate the router and set the base route.
+    const baseUrl = '/logs'
+    this.router = new Router({ prefix: baseUrl })
+
+    // _this = this
+  }
+
+  attachControllers (app) {
+    if (!app) {
+      throw new Error(
+        'Must pass app object when attaching REST API controllers.'
+      )
+    }
+
+    // Define the routes and attach the controller.
+    this.router.post('/', this.logsRESTController.getLogs)
+
+    // Attach the Controller routes to the Koa app.
+    app.use(this.router.routes())
+    app.use(this.router.allowedMethods())
+  }
+}
+
+module.exports = LogsRESTRouter
diff --git a/src/modules/index.js b/src/modules/index.js
deleted file mode 100644
index 5628dc2..0000000
--- a/src/modules/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-const glob = require('glob')
-const Router = require('koa-router')
-
-module.exports = function initModules (app) {
-  glob(
-    `${__dirname.toString()}/*`,
-    { ignore: '**/index.js' },
-    (err, matches) => {
-      if (err) {
-        throw err
-      }
-
-      // Loop through each sub-directory in the modules directory.
-      matches.forEach((mod) => {
-        // console.log(`router = ${mod}/router`)
-        const router = require(`${mod}/router`)
-
-        const routes = router.routes
-        const baseUrl = router.baseUrl
-        const instance = new Router({ prefix: baseUrl })
-
-        // console.log(`routes: ${JSON.stringify(routes, null, 2)}`)
-
-        // Loop through each route defined in the router.js file.
-        routes.forEach((config) => {
-          // console.log(`modules/index.js config: ${JSON.stringify(config, null, 2)}`)
-          // const {
-          //  method = '',
-          //  route = '',
-          //  handlers = []
-          // } = config
-          const method = config.method || ''
-          const route = config.route || ''
-          const handlers = config.handlers || []
-
-          const lastHandler = handlers.pop()
-
-          instance[method.toLowerCase()](
-            route,
-            ...handlers,
-            async function (ctx) {
-              // console.log(`typeof lastHandler: ${typeof (lastHandler)}`)
-              // return await lastHandler(ctx)
-              return lastHandler(ctx)
-            }
-          )
-
-          // console.log(`instance: ${JSON.stringify(instance, null, 2)}`)
-
-          app.use(instance.routes()).use(instance.allowedMethods())
-        })
-      })
-    }
-  )
-}
diff --git a/src/modules/logapi/router.js b/src/modules/logapi/router.js
deleted file mode 100644
index 50fcebf..0000000
--- a/src/modules/logapi/router.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// const validator = require('../../middleware/validators')
-const LogApi = require('./controller')
-const logApi = new LogApi()
-
-module.exports.baseUrl = '/logapi'
-
-module.exports.routes = [
-  {
-    method: 'POST',
-    route: '/',
-    handlers: [logApi.getLogs]
-  }
-  /*
-  {
-    method: 'GET',
-    route: '/',
-    handlers: [validator.ensureUser, user.getUsers]
-  },
-  {
-    method: 'GET',
-    route: '/:id',
-    handlers: [validator.ensureUser, user.getUser]
-  },
-  {
-    method: 'PUT',
-    route: '/:id',
-    handlers: [validator.ensureTargetUserOrAdmin, user.getUser, user.updateUser]
-  },
-  {
-    method: 'DELETE',
-    route: '/:id',
-    handlers: [validator.ensureTargetUserOrAdmin, user.getUser, user.deleteUser]
-  }
-  */
-]
diff --git a/test/e2e/automated/temp/a06-logapi.rest-e2e.js b/test/e2e/automated/a06-logapi.rest-e2e.js
similarity index 90%
rename from test/e2e/automated/temp/a06-logapi.rest-e2e.js
rename to test/e2e/automated/a06-logapi.rest-e2e.js
index 82ee275..5ea6dc4 100644
--- a/test/e2e/automated/temp/a06-logapi.rest-e2e.js
+++ b/test/e2e/automated/a06-logapi.rest-e2e.js
@@ -9,7 +9,7 @@ util.inspect.defaultOptions = { depth: 1 }
 
 const LOCALHOST = `http://localhost:${config.port}`
 
-const LogsController = require('../../../src/modules/logapi/controller')
+const LogsController = require('../../../src/controllers/rest-api/logs/controller')
 const mockContext = require('../../unit/mocks/ctx-mock').context
 
 let sandbox
@@ -23,12 +23,12 @@ describe('LogsApi', () => {
 
   afterEach(() => sandbox.restore())
 
-  describe('POST /logapi', () => {
+  describe('POST /logs', () => {
     it('should return false if password is not provided', async () => {
       try {
         const options = {
           method: 'post',
-          url: `${LOCALHOST}/logapi`,
+          url: `${LOCALHOST}/logs`,
           data: {}
         }
 
@@ -38,11 +38,12 @@ describe('LogsApi', () => {
         assert(false, 'Unexpected result')
       }
     })
+
     it('should return log', async () => {
       try {
         const options = {
           method: 'post',
-          url: `${LOCALHOST}/logapi`,
+          url: `${LOCALHOST}/logs`,
           data: {
             password: 'test'
           }
@@ -59,6 +60,7 @@ describe('LogsApi', () => {
         assert(false, 'Unexpected result')
       }
     })
+
     it('should return false if files are not found!', async () => {
       try {
         sandbox.stub(uut.logsApiLib, 'getLogs').resolves({
@@ -80,10 +82,13 @@ describe('LogsApi', () => {
         assert.fail('Unexpected result')
       }
     })
+
     it('should catch and handle errors', async () => {
       try {
         // Force an error
-        sandbox.stub(uut.logsApiLib.fs, 'existsSync').throws(new Error('test error'))
+        sandbox
+          .stub(uut.logsApiLib.fs, 'existsSync')
+          .throws(new Error('test error'))
 
         // Mock the context object.
         const ctx = mockContext()
@@ -101,6 +106,7 @@ describe('LogsApi', () => {
         assert.include(err.message, 'test error')
       }
     })
+
     it('should throw unhandled error', async () => {
       try {
         // Force an error
diff --git a/test/unit/rest-api/a06-logapi.rest-unit.js b/test/unit/rest-api/a06-logapi.rest-unit.js
index 88a955c..700de21 100644
--- a/test/unit/rest-api/a06-logapi.rest-unit.js
+++ b/test/unit/rest-api/a06-logapi.rest-unit.js
@@ -6,7 +6,7 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const LogsApiController = require('../../../src/modules/logapi/controller')
+const LogsApiController = require('../../../src/controllers/rest-api/logs/controller')
 let uut
 let sandbox
 let ctx
@@ -14,8 +14,7 @@ let ctx
 const mockContext = require('../../unit/mocks/ctx-mock').context
 
 describe('Logapi', () => {
-  before(async () => {
-  })
+  before(async () => {})
 
   beforeEach(() => {
     uut = new LogsApiController()
@@ -42,7 +41,9 @@ describe('Logapi', () => {
     it('should return 500 status on biz logic Unhandled error', async () => {
       try {
         // eslint-disable
-        sandbox.stub(uut.logsApiLib, 'getLogs').returns(Promise.reject(new Error()))
+        sandbox
+          .stub(uut.logsApiLib, 'getLogs')
+          .returns(Promise.reject(new Error()))
 
         ctx.request.body = {
           password: 'test'

From 1dcb7f84c2ca050f37037da8c23ebe61b1a4e46a Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 15:00:00 -0700
Subject: [PATCH 07/43] Added e2e validation tests

---
 .../rest-api/middleware/validators.js         |   3 +
 .../{temp => }/a08-validators.rest-e2e.js     | 103 ++++++++----------
 2 files changed, 48 insertions(+), 58 deletions(-)
 rename test/e2e/automated/{temp => }/a08-validators.rest-e2e.js (77%)

diff --git a/src/controllers/rest-api/middleware/validators.js b/src/controllers/rest-api/middleware/validators.js
index 071acb0..80cc850 100644
--- a/src/controllers/rest-api/middleware/validators.js
+++ b/src/controllers/rest-api/middleware/validators.js
@@ -47,6 +47,7 @@ class Validators {
       }
 
       // return next()
+      return true
     } catch (error) {
       ctx.throw(401)
     }
@@ -85,6 +86,7 @@ class Validators {
       }
 
       // return next()
+      return true
     } catch (error) {
       ctx.throw(401, error.message)
     }
@@ -142,6 +144,7 @@ class Validators {
       }
 
       // return next()
+      return true
     } catch (error) {
       ctx.throw(401, error.message)
     }
diff --git a/test/e2e/automated/temp/a08-validators.rest-e2e.js b/test/e2e/automated/a08-validators.rest-e2e.js
similarity index 77%
rename from test/e2e/automated/temp/a08-validators.rest-e2e.js
rename to test/e2e/automated/a08-validators.rest-e2e.js
index 633936f..b93d4a8 100644
--- a/test/e2e/automated/temp/a08-validators.rest-e2e.js
+++ b/test/e2e/automated/a08-validators.rest-e2e.js
@@ -1,7 +1,7 @@
 const assert = require('chai').assert
 const testUtils = require('../../utils/test-utils')
 
-const Validators = require('../../../src/middleware/validators')
+const Validators = require('../../../src/controllers/rest-api/middleware/validators')
 
 const sinon = require('sinon')
 const mockContext = require('../../unit/mocks/ctx-mock').context
@@ -52,7 +52,7 @@ describe('Validators', () => {
   describe('ensureUser()', () => {
     it('should throw 401 if user cant be found', async () => {
       try {
-      // Force an error
+        // Force an error
         sandbox.stub(uut.User, 'findById').resolves(false)
 
         // Mock the context object.
@@ -71,6 +71,7 @@ describe('Validators', () => {
         assert.include(err.message, 'Unauthorized')
       }
     })
+
     it('should throw 401 if token not found', async () => {
       try {
         // Mock the context object.
@@ -84,6 +85,7 @@ describe('Validators', () => {
         assert.include(err.message, 'Unauthorized')
       }
     })
+
     it('should throw 401 if token is invalid', async () => {
       try {
         // Mock the context object.
@@ -101,28 +103,21 @@ describe('Validators', () => {
         assert.include(err.message, 'Unauthorized')
       }
     })
-    it('should trigger the "next" function if user is admin', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.params = { id: context.id }
 
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.adminJWT}`
-          }
+    it('should return true if user is admin', async () => {
+      // Mock the context object.
+      const ctx = mockContext()
+      ctx.params = { id: context.id }
+
+      ctx.request = {
+        header: {
+          authorization: `Bearer ${context.adminJWT}`
         }
-        // Function that execute if the validations
-        // are successful
-        const next = () => { return 'next function' }
-
-        const result = await uut.ensureUser(ctx, next)
-
-        assert.isString(result)
-        assert.equal(result, 'next function')
-      } catch (err) {
-        assert(false, 'Unexpected result')
       }
+
+      const result = await uut.ensureUser(ctx)
+
+      assert.equal(result, true)
     })
   })
 
@@ -140,6 +135,7 @@ describe('Validators', () => {
         assert.include(err.message, 'Unauthorized')
       }
     })
+
     it('should throw 401 if token is invalid', async () => {
       try {
         // Mock the context object.
@@ -157,6 +153,7 @@ describe('Validators', () => {
         assert.include(err.message, 'Unauthorized')
       }
     })
+
     it('should throw 401 if user cant be found', async () => {
       try {
         // Force an error
@@ -177,6 +174,7 @@ describe('Validators', () => {
         assert.include(err.message, 'Unauthorized')
       }
     })
+
     it('should throw 401 if user is not admin type', async () => {
       try {
         // Mock the context object.
@@ -194,26 +192,19 @@ describe('Validators', () => {
         assert.include(err.message, 'not admin')
       }
     })
-    it('should trigger the "next" function if user is admin', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.adminJWT}`
-          }
+
+    it('should return true if user is admin', async () => {
+      // Mock the context object.
+      const ctx = mockContext()
+      ctx.request = {
+        header: {
+          authorization: `Bearer ${context.adminJWT}`
         }
-        // Function that execute if the validations
-        // are successful
-        const next = () => { return 'next function' }
-
-        const result = await uut.ensureAdmin(ctx, next)
-
-        assert.isString(result)
-        assert.equal(result, 'next function')
-      } catch (err) {
-        assert(false, 'Unexpected result')
       }
+
+      const result = await uut.ensureAdmin(ctx)
+
+      assert.equal(result, true)
     })
   })
 
@@ -231,6 +222,7 @@ describe('Validators', () => {
         assert.include(err.message, 'Unauthorized')
       }
     })
+
     it('should throw 401 if token is invalid', async () => {
       try {
         // Mock the context object.
@@ -250,6 +242,7 @@ describe('Validators', () => {
         assert.include(err.message, 'Unauthorized')
       }
     })
+
     it('should throw 401 if user cant be found', async () => {
       try {
         // Force an error
@@ -272,6 +265,7 @@ describe('Validators', () => {
         assert.include(err.message, 'Unauthorized')
       }
     })
+
     it('should throw 401 if user is not admin type', async () => {
       try {
         // Mock the context object.
@@ -291,28 +285,21 @@ describe('Validators', () => {
         assert.include(err.message, 'not admin')
       }
     })
-    it('should trigger the "next" function if user is admin', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.params = { id: context.id }
 
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.adminJWT}`
-          }
+    it('should return true if user is admin', async () => {
+      // Mock the context object.
+      const ctx = mockContext()
+      ctx.params = { id: context.id }
+
+      ctx.request = {
+        header: {
+          authorization: `Bearer ${context.adminJWT}`
         }
-        // Function that execute if the validations
-        // are successful
-        const next = () => { return 'next function' }
-
-        const result = await uut.ensureTargetUserOrAdmin(ctx, next)
-
-        assert.isString(result)
-        assert.equal(result, 'next function')
-      } catch (err) {
-        assert(false, 'Unexpected result')
       }
+
+      const result = await uut.ensureTargetUserOrAdmin(ctx)
+
+      assert.equal(result, true)
     })
   })
 })

From 35948ea903d97629531dea40e959d01bcab9bd03 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 15:01:40 -0700
Subject: [PATCH 08/43] Reinstated admin e2e tests

---
 .../e2e/automated/{temp => }/a09-admin.rest-e2e.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
 rename test/e2e/automated/{temp => }/a09-admin.rest-e2e.js (92%)

diff --git a/test/e2e/automated/temp/a09-admin.rest-e2e.js b/test/e2e/automated/a09-admin.rest-e2e.js
similarity index 92%
rename from test/e2e/automated/temp/a09-admin.rest-e2e.js
rename to test/e2e/automated/a09-admin.rest-e2e.js
index 2563631..4391f2a 100644
--- a/test/e2e/automated/temp/a09-admin.rest-e2e.js
+++ b/test/e2e/automated/a09-admin.rest-e2e.js
@@ -17,6 +17,7 @@ describe('Admin', () => {
   })
 
   afterEach(() => sandbox.restore())
+
   describe('loginAdmin()', () => {
     it('should logind admin', async () => {
       try {
@@ -42,12 +43,12 @@ describe('Admin', () => {
         assert(false, 'Unexpected result')
       }
     })
+
     it('should handle axios error', async () => {
       try {
         // Returns an erroneous password to force
         // an auth error
-        sandbox
-          .stub(uut.jsonFiles, 'readJSON').resolves({ password: 'wrong' })
+        sandbox.stub(uut.jsonFiles, 'readJSON').resolves({ password: 'wrong' })
 
         await uut.loginAdmin()
         assert(false, 'Unexpected result')
@@ -57,6 +58,7 @@ describe('Admin', () => {
       }
     })
   })
+
   describe('createSystemUser()', () => {
     it('should create admin', async () => {
       try {
@@ -70,6 +72,7 @@ describe('Admin', () => {
         assert(false, 'Unexpected result')
       }
     })
+
     it('should handle axios error', async () => {
       try {
         const error1 = new Error('test error')
@@ -95,16 +98,15 @@ describe('Admin', () => {
         assert.include(err.message, 'test error')
       }
     })
+
     it('should handle errors when remove user', async () => {
       try {
         const error1 = new Error('test error')
         error1.response = {
           status: 422
         }
-        sandbox
-          .stub(uut.axios, 'request').throws(error1)
-        sandbox
-          .stub(uut.User, 'deleteOne').throws(new Error('test error'))
+        sandbox.stub(uut.axios, 'request').throws(error1)
+        sandbox.stub(uut.User, 'deleteOne').throws(new Error('test error'))
 
         await uut.createSystemUser()
         assert(false, 'Unexpected result')

From 15ed1e0e77502de7e3542530600469f1f2a225fb Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 15:08:07 -0700
Subject: [PATCH 09/43] Moved error middleware

---
 bin/server.js                                                   | 2 +-
 .../index.js => controllers/rest-api/middleware/error.js}       | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/{middleware/index.js => controllers/rest-api/middleware/error.js} (100%)

diff --git a/bin/server.js b/bin/server.js
index bf0c733..91a8c2a 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -18,7 +18,7 @@ const adminLib = new AdminLib()
 // const JSONRPC = require('../src/rpc')
 // const rpc = new JSONRPC()
 
-const errorMiddleware = require('../src/middleware')
+const errorMiddleware = require('../src/controllers/rest-api/middleware/error')
 const wlogger = require('../src/lib/wlogger')
 
 async function startServer () {
diff --git a/src/middleware/index.js b/src/controllers/rest-api/middleware/error.js
similarity index 100%
rename from src/middleware/index.js
rename to src/controllers/rest-api/middleware/error.js

From cc0b08c2b93532fc06adf4d8e8e68e9a8e72dd92 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 15:17:14 -0700
Subject: [PATCH 10/43] moved rpc folder into controllers folder

---
 src/{ => controllers}/rpc/about/index.js  |  2 +-
 src/{ => controllers}/rpc/auth/index.js   |  4 ++--
 src/{ => controllers}/rpc/index.js        |  2 +-
 src/{ => controllers}/rpc/rate-limit.js   |  0
 src/{ => controllers}/rpc/users/index.js  |  2 +-
 src/{ => controllers}/rpc/validators.js   |  9 ++++++---
 src/lib/ipfs.js                           |  2 +-
 test/unit/biz-logic/a10-rpc.unit.js       |  2 +-
 test/unit/json-rpc/a10-rpc.unit.js        |  2 +-
 test/unit/json-rpc/a11-auth.unit.js       | 15 ++++++---------
 test/unit/json-rpc/a12-validators.unit.js | 13 +++++--------
 test/unit/json-rpc/a13-users.unit.js      | 15 ++++++---------
 test/unit/json-rpc/a14-rate-limits.js     |  2 +-
 13 files changed, 32 insertions(+), 38 deletions(-)
 rename src/{ => controllers}/rpc/about/index.js (95%)
 rename src/{ => controllers}/rpc/auth/index.js (97%)
 rename src/{ => controllers}/rpc/index.js (98%)
 rename src/{ => controllers}/rpc/rate-limit.js (100%)
 rename src/{ => controllers}/rpc/users/index.js (99%)
 rename src/{ => controllers}/rpc/validators.js (92%)

diff --git a/src/rpc/about/index.js b/src/controllers/rpc/about/index.js
similarity index 95%
rename from src/rpc/about/index.js
rename to src/controllers/rpc/about/index.js
index 772382b..08e5221 100644
--- a/src/rpc/about/index.js
+++ b/src/controllers/rpc/about/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
-const aboutStr = require('../../../config/about')
+const aboutStr = require('../../../../config/about')
 
 class AuthRPC {
   constructor (localConfig) {
diff --git a/src/rpc/auth/index.js b/src/controllers/rpc/auth/index.js
similarity index 97%
rename from src/rpc/auth/index.js
rename to src/controllers/rpc/auth/index.js
index e9f3d67..4ab1a14 100644
--- a/src/rpc/auth/index.js
+++ b/src/controllers/rpc/auth/index.js
@@ -7,8 +7,8 @@ const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
 // const AuthLib = require('../../lib/auth')
-const UserLib = require('../../lib/users')
-const wlogger = require('../../lib/wlogger')
+const UserLib = require('../../../lib/users')
+const wlogger = require('../../../lib/wlogger')
 const RateLimit = require('../rate-limit')
 
 class AuthRPC {
diff --git a/src/rpc/index.js b/src/controllers/rpc/index.js
similarity index 98%
rename from src/rpc/index.js
rename to src/controllers/rpc/index.js
index 88f5505..59d4a46 100644
--- a/src/rpc/index.js
+++ b/src/controllers/rpc/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local support libraries
-const wlogger = require('../lib/wlogger')
+const wlogger = require('../../lib/wlogger')
 const UserController = require('./users')
 const AuthController = require('./auth')
 const AboutController = require('./about')
diff --git a/src/rpc/rate-limit.js b/src/controllers/rpc/rate-limit.js
similarity index 100%
rename from src/rpc/rate-limit.js
rename to src/controllers/rpc/rate-limit.js
diff --git a/src/rpc/users/index.js b/src/controllers/rpc/users/index.js
similarity index 99%
rename from src/rpc/users/index.js
rename to src/controllers/rpc/users/index.js
index fd4bfa4..72545d8 100644
--- a/src/rpc/users/index.js
+++ b/src/controllers/rpc/users/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
-const UserLib = require('../../lib/users')
+const UserLib = require('../../../lib/users')
 const Validators = require('../validators')
 const RateLimit = require('../rate-limit')
 
diff --git a/src/rpc/validators.js b/src/controllers/rpc/validators.js
similarity index 92%
rename from src/rpc/validators.js
rename to src/controllers/rpc/validators.js
index 662e723..2df5f6e 100644
--- a/src/rpc/validators.js
+++ b/src/controllers/rpc/validators.js
@@ -7,8 +7,8 @@
 const jwt = require('jsonwebtoken')
 
 // Local libraries
-const config = require('../../config')
-const UserModel = require('../models/users')
+const config = require('../../../config')
+const UserModel = require('../../models/users')
 
 class Validators {
   constructor () {
@@ -71,7 +71,10 @@ class Validators {
       }
 
       // Get the user model for the targeted User
-      const targetedUser = await this.UserModel.findById(targetUserId, '-password')
+      const targetedUser = await this.UserModel.findById(
+        targetUserId,
+        '-password'
+      )
 
       // Return the user model.
       return targetedUser
diff --git a/src/lib/ipfs.js b/src/lib/ipfs.js
index 897504f..5dbbc4f 100644
--- a/src/lib/ipfs.js
+++ b/src/lib/ipfs.js
@@ -11,7 +11,7 @@ const BCHJS = require('@psf/bch-js')
 
 // Local libraries
 const config = require('../../config')
-const JSONRPC = require('../rpc')
+const JSONRPC = require('../controllers/rpc')
 
 class IPFSLib {
   constructor (localConfig) {
diff --git a/test/unit/biz-logic/a10-rpc.unit.js b/test/unit/biz-logic/a10-rpc.unit.js
index 84f36dc..bdffbd5 100644
--- a/test/unit/biz-logic/a10-rpc.unit.js
+++ b/test/unit/biz-logic/a10-rpc.unit.js
@@ -5,7 +5,7 @@
 // Public npm libraries
 const jsonrpc = require('jsonrpc-lite')
 
-const JSONRPC = require('../../../src/rpc')
+const JSONRPC = require('../../../src/controllers/rpc')
 
 describe('#JSON RPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a10-rpc.unit.js b/test/unit/json-rpc/a10-rpc.unit.js
index ff5a5af..0d1d851 100644
--- a/test/unit/json-rpc/a10-rpc.unit.js
+++ b/test/unit/json-rpc/a10-rpc.unit.js
@@ -12,7 +12,7 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries.
-const JSONRPC = require('../../../src/rpc')
+const JSONRPC = require('../../../src/controllers/rpc')
 
 describe('#JSON RPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a11-auth.unit.js b/test/unit/json-rpc/a11-auth.unit.js
index 76a09ae..3ec17c4 100644
--- a/test/unit/json-rpc/a11-auth.unit.js
+++ b/test/unit/json-rpc/a11-auth.unit.js
@@ -14,8 +14,8 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const AuthRPC = require('../../../src/rpc/auth')
-const RateLimit = require('../../../src/rpc/rate-limit')
+const AuthRPC = require('../../../src/controllers/rpc/auth')
+const RateLimit = require('../../../src/controllers/rpc/rate-limit')
 const UserLib = require('../../../src/lib/users')
 const userLib = new UserLib()
 
@@ -29,13 +29,10 @@ describe('#AuthRPC', () => {
     console.log(`Connecting to database: ${config.database}`)
     mongoose.Promise = global.Promise
     mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(
-      config.database,
-      {
-        useUnifiedTopology: true,
-        useNewUrlParser: true
-      }
-    )
+    await mongoose.connect(config.database, {
+      useUnifiedTopology: true,
+      useNewUrlParser: true
+    })
 
     // Create a test user.
     testUser = await userLib.createUser({
diff --git a/test/unit/json-rpc/a12-validators.unit.js b/test/unit/json-rpc/a12-validators.unit.js
index 60b1820..341c2d8 100644
--- a/test/unit/json-rpc/a12-validators.unit.js
+++ b/test/unit/json-rpc/a12-validators.unit.js
@@ -16,7 +16,7 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const Validators = require('../../../src/rpc/validators')
+const Validators = require('../../../src/controllers/rpc/validators')
 const UserLib = require('../../../src/lib/users')
 const userLib = new UserLib()
 
@@ -30,13 +30,10 @@ describe('#validators', () => {
     console.log(`Connecting to database: ${config.database}`)
     mongoose.Promise = global.Promise
     mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(
-      config.database,
-      {
-        useUnifiedTopology: true,
-        useNewUrlParser: true
-      }
-    )
+    await mongoose.connect(config.database, {
+      useUnifiedTopology: true,
+      useNewUrlParser: true
+    })
 
     // Create a test user.
     testUser = await userLib.createUser({
diff --git a/test/unit/json-rpc/a13-users.unit.js b/test/unit/json-rpc/a13-users.unit.js
index aecb427..693f95e 100644
--- a/test/unit/json-rpc/a13-users.unit.js
+++ b/test/unit/json-rpc/a13-users.unit.js
@@ -14,8 +14,8 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const UserRPC = require('../../../src/rpc/users')
-const RateLimit = require('../../../src/rpc/rate-limit')
+const UserRPC = require('../../../src/controllers/rpc/users')
+const RateLimit = require('../../../src/controllers/rpc/rate-limit')
 const UserModel = require('../../../src/models/users')
 
 describe('#UserRPC', () => {
@@ -28,13 +28,10 @@ describe('#UserRPC', () => {
     console.log(`Connecting to database: ${config.database}`)
     mongoose.Promise = global.Promise
     mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(
-      config.database,
-      {
-        useUnifiedTopology: true,
-        useNewUrlParser: true
-      }
-    )
+    await mongoose.connect(config.database, {
+      useUnifiedTopology: true,
+      useNewUrlParser: true
+    })
   })
 
   beforeEach(() => {
diff --git a/test/unit/json-rpc/a14-rate-limits.js b/test/unit/json-rpc/a14-rate-limits.js
index 4b34428..506f748 100644
--- a/test/unit/json-rpc/a14-rate-limits.js
+++ b/test/unit/json-rpc/a14-rate-limits.js
@@ -12,7 +12,7 @@ const assert = require('chai').assert
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const RateLimit = require('../../../src/rpc/rate-limit')
+const RateLimit = require('../../../src/controllers/rpc/rate-limit')
 
 describe('#rate-limit', () => {
   let uut

From 574e4a3d90c81098fa95333f1415d5d860afe2f4 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 15:20:51 -0700
Subject: [PATCH 11/43] Renamed rpc folder to json-rpc

---
 src/controllers/{rpc => json-rpc}/about/index.js | 0
 src/controllers/{rpc => json-rpc}/auth/index.js  | 0
 src/controllers/{rpc => json-rpc}/index.js       | 0
 src/controllers/{rpc => json-rpc}/rate-limit.js  | 0
 src/controllers/{rpc => json-rpc}/users/index.js | 0
 src/controllers/{rpc => json-rpc}/validators.js  | 0
 src/lib/ipfs.js                                  | 2 +-
 test/unit/biz-logic/a10-rpc.unit.js              | 2 +-
 test/unit/json-rpc/a10-rpc.unit.js               | 2 +-
 test/unit/json-rpc/a11-auth.unit.js              | 4 ++--
 test/unit/json-rpc/a12-validators.unit.js        | 2 +-
 test/unit/json-rpc/a13-users.unit.js             | 4 ++--
 test/unit/json-rpc/a14-rate-limits.js            | 2 +-
 13 files changed, 9 insertions(+), 9 deletions(-)
 rename src/controllers/{rpc => json-rpc}/about/index.js (100%)
 rename src/controllers/{rpc => json-rpc}/auth/index.js (100%)
 rename src/controllers/{rpc => json-rpc}/index.js (100%)
 rename src/controllers/{rpc => json-rpc}/rate-limit.js (100%)
 rename src/controllers/{rpc => json-rpc}/users/index.js (100%)
 rename src/controllers/{rpc => json-rpc}/validators.js (100%)

diff --git a/src/controllers/rpc/about/index.js b/src/controllers/json-rpc/about/index.js
similarity index 100%
rename from src/controllers/rpc/about/index.js
rename to src/controllers/json-rpc/about/index.js
diff --git a/src/controllers/rpc/auth/index.js b/src/controllers/json-rpc/auth/index.js
similarity index 100%
rename from src/controllers/rpc/auth/index.js
rename to src/controllers/json-rpc/auth/index.js
diff --git a/src/controllers/rpc/index.js b/src/controllers/json-rpc/index.js
similarity index 100%
rename from src/controllers/rpc/index.js
rename to src/controllers/json-rpc/index.js
diff --git a/src/controllers/rpc/rate-limit.js b/src/controllers/json-rpc/rate-limit.js
similarity index 100%
rename from src/controllers/rpc/rate-limit.js
rename to src/controllers/json-rpc/rate-limit.js
diff --git a/src/controllers/rpc/users/index.js b/src/controllers/json-rpc/users/index.js
similarity index 100%
rename from src/controllers/rpc/users/index.js
rename to src/controllers/json-rpc/users/index.js
diff --git a/src/controllers/rpc/validators.js b/src/controllers/json-rpc/validators.js
similarity index 100%
rename from src/controllers/rpc/validators.js
rename to src/controllers/json-rpc/validators.js
diff --git a/src/lib/ipfs.js b/src/lib/ipfs.js
index 5dbbc4f..22c1df8 100644
--- a/src/lib/ipfs.js
+++ b/src/lib/ipfs.js
@@ -11,7 +11,7 @@ const BCHJS = require('@psf/bch-js')
 
 // Local libraries
 const config = require('../../config')
-const JSONRPC = require('../controllers/rpc')
+const JSONRPC = require('../controllers/json-rpc')
 
 class IPFSLib {
   constructor (localConfig) {
diff --git a/test/unit/biz-logic/a10-rpc.unit.js b/test/unit/biz-logic/a10-rpc.unit.js
index bdffbd5..f28752c 100644
--- a/test/unit/biz-logic/a10-rpc.unit.js
+++ b/test/unit/biz-logic/a10-rpc.unit.js
@@ -5,7 +5,7 @@
 // Public npm libraries
 const jsonrpc = require('jsonrpc-lite')
 
-const JSONRPC = require('../../../src/controllers/rpc')
+const JSONRPC = require('../../../src/controllers/json-rpc')
 
 describe('#JSON RPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a10-rpc.unit.js b/test/unit/json-rpc/a10-rpc.unit.js
index 0d1d851..a439e0e 100644
--- a/test/unit/json-rpc/a10-rpc.unit.js
+++ b/test/unit/json-rpc/a10-rpc.unit.js
@@ -12,7 +12,7 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries.
-const JSONRPC = require('../../../src/controllers/rpc')
+const JSONRPC = require('../../../src/controllers/json-rpc')
 
 describe('#JSON RPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a11-auth.unit.js b/test/unit/json-rpc/a11-auth.unit.js
index 3ec17c4..078e2dd 100644
--- a/test/unit/json-rpc/a11-auth.unit.js
+++ b/test/unit/json-rpc/a11-auth.unit.js
@@ -14,8 +14,8 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const AuthRPC = require('../../../src/controllers/rpc/auth')
-const RateLimit = require('../../../src/controllers/rpc/rate-limit')
+const AuthRPC = require('../../../src/controllers/json-rpc/auth')
+const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
 const UserLib = require('../../../src/lib/users')
 const userLib = new UserLib()
 
diff --git a/test/unit/json-rpc/a12-validators.unit.js b/test/unit/json-rpc/a12-validators.unit.js
index 341c2d8..45c956a 100644
--- a/test/unit/json-rpc/a12-validators.unit.js
+++ b/test/unit/json-rpc/a12-validators.unit.js
@@ -16,7 +16,7 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const Validators = require('../../../src/controllers/rpc/validators')
+const Validators = require('../../../src/controllers/json-rpc/validators')
 const UserLib = require('../../../src/lib/users')
 const userLib = new UserLib()
 
diff --git a/test/unit/json-rpc/a13-users.unit.js b/test/unit/json-rpc/a13-users.unit.js
index 693f95e..e8e9b1d 100644
--- a/test/unit/json-rpc/a13-users.unit.js
+++ b/test/unit/json-rpc/a13-users.unit.js
@@ -14,8 +14,8 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const UserRPC = require('../../../src/controllers/rpc/users')
-const RateLimit = require('../../../src/controllers/rpc/rate-limit')
+const UserRPC = require('../../../src/controllers/json-rpc/users')
+const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
 const UserModel = require('../../../src/models/users')
 
 describe('#UserRPC', () => {
diff --git a/test/unit/json-rpc/a14-rate-limits.js b/test/unit/json-rpc/a14-rate-limits.js
index 506f748..f1bf28b 100644
--- a/test/unit/json-rpc/a14-rate-limits.js
+++ b/test/unit/json-rpc/a14-rate-limits.js
@@ -12,7 +12,7 @@ const assert = require('chai').assert
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const RateLimit = require('../../../src/controllers/rpc/rate-limit')
+const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
 
 describe('#rate-limit', () => {
   let uut

From fd2cfe0b2fe2cf9fc7ddcde3d787beaf6db0d225 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 17:17:26 -0700
Subject: [PATCH 12/43] Created and connected index.js files for use-cases,
 adapters, and controllers

---
 bin/server.js                       |   16 +-
 package-lock.json                   | 3435 +++++++++++++++++++++++++--
 package.json                        |   10 +-
 src/adapters/index.js               |   11 +
 src/adapters/ipfs/index.js          |   43 +
 src/adapters/ipfs/ipfs-coord.js     |   73 +
 src/adapters/ipfs/ipfs.js           |   80 +
 src/controllers/index.js            |   47 +
 src/controllers/json-rpc/index.js   |   18 +-
 src/controllers/rest-api/index.js   |   72 +-
 src/use-cases/index.js              |   18 +
 test/unit/biz-logic/a10-rpc.unit.js |   97 +-
 test/unit/json-rpc/a10-rpc.unit.js  |    5 +-
 test/unit/mocks/adapters/index.js   |   14 +
 test/unit/mocks/use-cases/index.js  |    7 +
 15 files changed, 3635 insertions(+), 311 deletions(-)
 create mode 100644 src/adapters/index.js
 create mode 100644 src/adapters/ipfs/index.js
 create mode 100644 src/adapters/ipfs/ipfs-coord.js
 create mode 100644 src/adapters/ipfs/ipfs.js
 create mode 100644 src/controllers/index.js
 create mode 100644 src/use-cases/index.js
 create mode 100644 test/unit/mocks/adapters/index.js
 create mode 100644 test/unit/mocks/use-cases/index.js

diff --git a/bin/server.js b/bin/server.js
index 91a8c2a..f3b7b6a 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -12,7 +12,7 @@ const cors = require('kcors')
 
 // Local libraries
 const config = require('../config') // this first.
-const IPFSLib = require('../src/lib/ipfs')
+// const IPFSLib = require('../src/lib/ipfs')
 const AdminLib = require('../src/lib/admin')
 const adminLib = new AdminLib()
 // const JSONRPC = require('../src/rpc')
@@ -52,13 +52,9 @@ async function startServer () {
   app.use(passport.initialize())
   app.use(passport.session())
 
-  // Attach boilerplate REST API endpoints.
-  const restApi = require('../src/controllers/rest-api')
-  restApi.attachControllers(app)
-
-  // Custom Middleware Modules
-  // const modules = require('../src/modules')
-  // modules(app)
+  // Attach REST API and JSON RPC controllers to the app.
+  const controllers = require('../src/controllers')
+  controllers.attachControllers(app)
 
   // Enable CORS for testing
   // THIS IS A SECURITY RISK. COMMENT OUT FOR PRODUCTION
@@ -76,10 +72,6 @@ async function startServer () {
   const success = await adminLib.createSystemUser()
   if (success) console.log('System admin user created.')
 
-  // Start the IPFS node.
-  const ipfsLib = new IPFSLib()
-  await ipfsLib.start()
-
   return app
 }
 // startServer()
diff --git a/package-lock.json b/package-lock.json
index 4703f67..eff5d4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,12 +8,12 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@psf/bch-js": "^4.18.0",
+        "@psf/bch-js": "^4.20.1",
         "axios": "^0.21.1",
         "bcryptjs": "^2.4.3",
         "glob": "^7.1.6",
         "ipfs": "^0.54.4",
-        "ipfs-coord": "^2.1.13",
+        "ipfs-coord": "^3.2.0",
         "jsonrpc-lite": "^2.2.0",
         "jsonwebtoken": "^8.5.1",
         "kcors": "^2.2.2",
@@ -31,7 +31,6 @@
         "mongoose": "^5.11.15",
         "nodemailer": "^6.4.17",
         "passport-local": "^1.0.0",
-        "uuid": "^8.3.2",
         "winston": "^3.3.3",
         "winston-daily-rotate-file": "^4.5.0"
       },
@@ -48,9 +47,10 @@
         "husky": "^4.3.8",
         "mocha": "^8.2.1",
         "nyc": "^15.1.0",
-        "semantic-release": "^17.4.2",
+        "semantic-release": "^17.4.4",
         "sinon": "^9.2.4",
-        "standard": "^16.0.3"
+        "standard": "^16.0.3",
+        "uuid": "^8.3.2"
       }
     },
     "node_modules/@achingbrain/electron-fetch": {
@@ -302,6 +302,694 @@
         "node": ">=8"
       }
     },
+    "node_modules/@ethersproject/abi": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.4.0.tgz",
+      "integrity": "sha512-9gU2H+/yK1j2eVMdzm6xvHSnMxk8waIHQGYCZg5uvAyH0rsAzxkModzBSpbAkAuhKFEovC2S9hM4nPuLym8IZw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/hash": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/abstract-provider": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.4.0.tgz",
+      "integrity": "sha512-vPBR7HKUBY0lpdllIn7tLIzNN7DrVnhCLKSzY0l8WAwxz686m/aL7ASDzrVxV93GJtIub6N2t4dfZ29CkPOxgA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/networks": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "@ethersproject/web": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/abstract-signer": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.4.0.tgz",
+      "integrity": "sha512-AieQAzt05HJZS2bMofpuxMEp81AHufA5D6M4ScKwtolj041nrfIbIi8ciNW7+F59VYxXq+V4c3d568Q6l2m8ew==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/address": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.4.0.tgz",
+      "integrity": "sha512-SD0VgOEkcACEG/C6xavlU1Hy3m5DGSXW3CUHkaaEHbAPPsgi0coP5oNPsxau8eTlZOk/bpa/hKeCNoK5IzVI2Q==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/rlp": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/base64": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.4.0.tgz",
+      "integrity": "sha512-CjQw6E17QDSSC5jiM9YpF7N1aSCHmYGMt9bWD8PWv6YPMxjsys2/Q8xLrROKI3IWJ7sFfZ8B3flKDTM5wlWuZQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/basex": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.4.0.tgz",
+      "integrity": "sha512-J07+QCVJ7np2bcpxydFVf/CuYo9mZ7T73Pe7KQY4c1lRlrixMeblauMxHXD0MPwFmUHZIILDNViVkykFBZylbg==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/bignumber": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.4.0.tgz",
+      "integrity": "sha512-OXUu9f9hO3vGRIPxU40cignXZVaYyfx6j9NNMjebKdnaCL3anCLSSy8/b8d03vY6dh7duCC0kW72GEC4tZer2w==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "bn.js": "^4.11.9"
+      }
+    },
+    "node_modules/@ethersproject/bignumber/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/@ethersproject/bytes": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.4.0.tgz",
+      "integrity": "sha512-H60ceqgTHbhzOj4uRc/83SCN9d+BSUnOkrr2intevqdtEMO1JFVZ1XL84OEZV+QjV36OaZYxtnt4lGmxcGsPfA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/constants": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.4.0.tgz",
+      "integrity": "sha512-tzjn6S7sj9+DIIeKTJLjK9WGN2Tj0P++Z8ONEIlZjyoTkBuODN+0VfhAyYksKi43l1Sx9tX2VlFfzjfmr5Wl3Q==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/contracts": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.4.0.tgz",
+      "integrity": "sha512-hkO3L3IhS1Z3ZtHtaAG/T87nQ7KiPV+/qnvutag35I0IkiQ8G3ZpCQ9NNOpSCzn4pWSW4CfzmtE02FcqnLI+hw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abi": "^5.4.0",
+        "@ethersproject/abstract-provider": "^5.4.0",
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/hash": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.4.0.tgz",
+      "integrity": "sha512-xymAM9tmikKgbktOCjW60Z5sdouiIIurkZUr9oW5NOex5uwxrbsYG09kb5bMcNjlVeJD3yPivTNzViIs1GCbqA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/hdnode": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.4.0.tgz",
+      "integrity": "sha512-pKxdS0KAaeVGfZPp1KOiDLB0jba11tG6OP1u11QnYfb7pXn6IZx0xceqWRr6ygke8+Kw74IpOoSi7/DwANhy8Q==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/basex": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/pbkdf2": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/sha2": "^5.4.0",
+        "@ethersproject/signing-key": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "@ethersproject/wordlists": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/json-wallets": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.4.0.tgz",
+      "integrity": "sha512-igWcu3fx4aiczrzEHwG1xJZo9l1cFfQOWzTqwRw/xcvxTk58q4f9M7cjh51EKphMHvrJtcezJ1gf1q1AUOfEQQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/hdnode": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/pbkdf2": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/random": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "aes-js": "3.0.0",
+        "scrypt-js": "3.0.1"
+      }
+    },
+    "node_modules/@ethersproject/json-wallets/node_modules/aes-js": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz",
+      "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0="
+    },
+    "node_modules/@ethersproject/keccak256": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.4.0.tgz",
+      "integrity": "sha512-FBI1plWet+dPUvAzPAeHzRKiPpETQzqSUWR1wXJGHVWi4i8bOSrpC3NwpkPjgeXG7MnugVc1B42VbfnQikyC/A==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "js-sha3": "0.5.7"
+      }
+    },
+    "node_modules/@ethersproject/keccak256/node_modules/js-sha3": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+      "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc="
+    },
+    "node_modules/@ethersproject/logger": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.4.0.tgz",
+      "integrity": "sha512-xYdWGGQ9P2cxBayt64d8LC8aPFJk6yWCawQi/4eJ4+oJdMMjEBMrIcIMZ9AxhwpPVmnBPrsB10PcXGmGAqgUEQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ]
+    },
+    "node_modules/@ethersproject/networks": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.4.1.tgz",
+      "integrity": "sha512-8SvowCKz9Uf4xC5DTKI8+il8lWqOr78kmiqAVLYT9lzB8aSmJHQMD1GSuJI0CW4hMAnzocpGpZLgiMdzsNSPig==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/pbkdf2": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.4.0.tgz",
+      "integrity": "sha512-x94aIv6tiA04g6BnazZSLoRXqyusawRyZWlUhKip2jvoLpzJuLb//KtMM6PEovE47pMbW+Qe1uw+68ameJjB7g==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/sha2": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/properties": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.4.0.tgz",
+      "integrity": "sha512-7jczalGVRAJ+XSRvNA6D5sAwT4gavLq3OXPuV/74o3Rd2wuzSL035IMpIMgei4CYyBdialJMrTqkOnzccLHn4A==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/providers": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.4.1.tgz",
+      "integrity": "sha512-p06eiFKz8nu/5Ju0kIX024gzEQIgE5pvvGrBCngpyVjpuLtUIWT3097Agw4mTn9/dEA0FMcfByzFqacBMSgCVg==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.4.0",
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/basex": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/hash": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/networks": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/random": "^5.4.0",
+        "@ethersproject/rlp": "^5.4.0",
+        "@ethersproject/sha2": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "@ethersproject/web": "^5.4.0",
+        "bech32": "1.1.4",
+        "ws": "7.4.6"
+      }
+    },
+    "node_modules/@ethersproject/random": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.4.0.tgz",
+      "integrity": "sha512-pnpWNQlf0VAZDEOVp1rsYQosmv2o0ITS/PecNw+mS2/btF8eYdspkN0vIXrCMtkX09EAh9bdk8GoXmFXM1eAKw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/rlp": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.4.0.tgz",
+      "integrity": "sha512-0I7MZKfi+T5+G8atId9QaQKHRvvasM/kqLyAH4XxBCBchAooH2EX5rL9kYZWwcm3awYV+XC7VF6nLhfeQFKVPg==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/sha2": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.4.0.tgz",
+      "integrity": "sha512-siheo36r1WD7Cy+bDdE1BJ8y0bDtqXCOxRMzPa4bV1TGt/eTUUt03BHoJNB6reWJD8A30E/pdJ8WFkq+/uz4Gg==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "hash.js": "1.1.7"
+      }
+    },
+    "node_modules/@ethersproject/signing-key": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.4.0.tgz",
+      "integrity": "sha512-q8POUeywx6AKg2/jX9qBYZIAmKSB4ubGXdQ88l40hmATj29JnG5pp331nAWwwxPn2Qao4JpWHNZsQN+bPiSW9A==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "bn.js": "^4.11.9",
+        "elliptic": "6.5.4",
+        "hash.js": "1.1.7"
+      }
+    },
+    "node_modules/@ethersproject/signing-key/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/@ethersproject/solidity": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.4.0.tgz",
+      "integrity": "sha512-XFQTZ7wFSHOhHcV1DpcWj7VXECEiSrBuv7JErJvB9Uo+KfCdc3QtUZV+Vjh/AAaYgezUEKbCtE6Khjm44seevQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/sha2": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/strings": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.4.0.tgz",
+      "integrity": "sha512-k/9DkH5UGDhv7aReXLluFG5ExurwtIpUfnDNhQA29w896Dw3i4uDTz01Quaptbks1Uj9kI8wo9tmW73wcIEaWA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/transactions": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.4.0.tgz",
+      "integrity": "sha512-s3EjZZt7xa4BkLknJZ98QGoIza94rVjaEed0rzZ/jB9WrIuu/1+tjvYCWzVrystXtDswy7TPBeIepyXwSYa4WQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/rlp": "^5.4.0",
+        "@ethersproject/signing-key": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/units": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.4.0.tgz",
+      "integrity": "sha512-Z88krX40KCp+JqPCP5oPv5p750g+uU6gopDYRTBGcDvOASh6qhiEYCRatuM/suC4S2XW9Zz90QI35MfSrTIaFg==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/wallet": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.4.0.tgz",
+      "integrity": "sha512-wU29majLjM6AjCjpat21mPPviG+EpK7wY1+jzKD0fg3ui5fgedf2zEu1RDgpfIMsfn8fJHJuzM4zXZ2+hSHaSQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.4.0",
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/hash": "^5.4.0",
+        "@ethersproject/hdnode": "^5.4.0",
+        "@ethersproject/json-wallets": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/random": "^5.4.0",
+        "@ethersproject/signing-key": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "@ethersproject/wordlists": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/web": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.4.0.tgz",
+      "integrity": "sha512-1bUusGmcoRLYgMn6c1BLk1tOKUIFuTg8j+6N8lYlbMpDesnle+i3pGSagGNvwjaiLo4Y5gBibwctpPRmjrh4Og==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/base64": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
+    "node_modules/@ethersproject/wordlists": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.4.0.tgz",
+      "integrity": "sha512-FemEkf6a+EBKEPxlzeVgUaVSodU7G0Na89jqKjmWMlDB0tomoU8RlEMgUvXyqtrg8N4cwpLh8nyRnm1Nay1isA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/hash": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
     "node_modules/@grpc/grpc-js": {
       "version": "1.2.12",
       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.12.tgz",
@@ -961,9 +1649,9 @@
       "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
     },
     "node_modules/@psf/bch-js": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.18.0.tgz",
-      "integrity": "sha512-M+C5LdBs8ZCyIcPwHLcKWd9BWD4UBQfwgTk+VcsUtUCb/v7nYyy915/L8v4C1gOKcziwatntrHzQsmxQHRDssw==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.20.1.tgz",
+      "integrity": "sha512-U/saVHfHA0535w5Z68mHH+8emPJE6LulTcX40kWBjk3Qd3etb9S9j5aqxK0axcwN0s5o2O7AYkfF0NFwPEoa9Q==",
       "dependencies": {
         "@psf/bip21": "^2.0.1",
         "@psf/bip32-utils": "^1.0.0",
@@ -2079,6 +2767,22 @@
       "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.1.tgz",
       "integrity": "sha512-yml9NiDEH4M4p0G4AcPkg8AAa4mF3nfYF28VQxaokpO67j9H7gWgmsVWJ/f1Rn+PzsnDYvzJzWIQzCqDKRvWlA=="
     },
+    "node_modules/abstract-leveldown": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.3.tgz",
+      "integrity": "sha1-EWsexcdxDvei1XBnaLvbREC+EHA=",
+      "dependencies": {
+        "xtend": "~3.0.0"
+      }
+    },
+    "node_modules/abstract-leveldown/node_modules/xtend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+      "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/abstract-logging": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz",
@@ -2261,6 +2965,14 @@
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
       "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
     },
+    "node_modules/any-signal": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/any-signal/-/any-signal-1.2.0.tgz",
+      "integrity": "sha512-Cl08k4xItix3jvu4cxO/dt2rQ6iUAjO66pTyRMub+WL1VXeAyZydCpD8GqWTPKfdL28U0R0UucmQVsUsBnvCmQ==",
+      "dependencies": {
+        "abort-controller": "^3.0.0"
+      }
+    },
     "node_modules/anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -2386,6 +3098,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/argsarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz",
+      "integrity": "sha1-bnIHtOzbObCviDA/pa4ivajfYcs="
+    },
     "node_modules/argv-formatter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/argv-formatter/-/argv-formatter-1.0.0.tgz",
@@ -2478,6 +3195,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/asmcrypto.js": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/asmcrypto.js/-/asmcrypto.js-2.3.2.tgz",
+      "integrity": "sha512-3FgFARf7RupsZETQ1nHnhLUUvpcttcCq1iZCaVAbJZbCZ5VNRrNyvpDyHTOb0KC3llFcsyOT/a99NZcCbeiEsA=="
+    },
     "node_modules/asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -2928,6 +3650,14 @@
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
       "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
     },
+    "node_modules/blob-to-it": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/blob-to-it/-/blob-to-it-0.0.2.tgz",
+      "integrity": "sha512-3/NRr0mUWQTkS71MYEC1teLbT5BTs7RZ6VMPXDV6qApjw3B4TAZspQuvDkYfHuD/XzL5p/RO91x5XRPeJvcCqg==",
+      "dependencies": {
+        "browser-readablestream-to-it": "^0.0.2"
+      }
+    },
     "node_modules/bluebird": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
@@ -2955,19 +3685,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/borc/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/bottleneck": {
       "version": "2.19.5",
       "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz",
@@ -3143,6 +3860,11 @@
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
     },
+    "node_modules/browser-readablestream-to-it": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/browser-readablestream-to-it/-/browser-readablestream-to-it-0.0.2.tgz",
+      "integrity": "sha512-bbiTccngeAbPmpTUJcUyr6JhivADKV9xkNJVLdA91vjdzXyFBZ6fgrzElQsV3k1UNGQACRTl3p4y+cEGG9U48A=="
+    },
     "node_modules/browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -4353,6 +5075,11 @@
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
       "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ="
     },
+    "node_modules/crdts": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/crdts/-/crdts-0.1.5.tgz",
+      "integrity": "sha512-4Z/dQqa9qzMPlrE+zd0ecl53QFwaTZVVYTUgxvpF0k8OcOy4HY7c+C9brXp81eigLE0EKENTVp3CjIMY9b/ezg=="
+    },
     "node_modules/create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
@@ -4409,6 +5136,11 @@
       "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz",
       "integrity": "sha1-PPY5FIemYppiR+sMoM4ACBt+Nho="
     },
+    "node_modules/d64": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d64/-/d64-1.0.0.tgz",
+      "integrity": "sha1-QAKofoUMv8n52XBrYPymE6MzbpA="
+    },
     "node_modules/dag-cbor-links": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/dag-cbor-links/-/dag-cbor-links-2.0.2.tgz",
@@ -6249,6 +6981,53 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ethers": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.4.1.tgz",
+      "integrity": "sha512-SrcddMdCgP1hukDvCPd87Aipbf4NWjQvdfAbZ65XSZGbfyuYPtIrUJPDH5B1SBRsdlfiEgX3eoz28DdBDzMNFg==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abi": "5.4.0",
+        "@ethersproject/abstract-provider": "5.4.0",
+        "@ethersproject/abstract-signer": "5.4.0",
+        "@ethersproject/address": "5.4.0",
+        "@ethersproject/base64": "5.4.0",
+        "@ethersproject/basex": "5.4.0",
+        "@ethersproject/bignumber": "5.4.0",
+        "@ethersproject/bytes": "5.4.0",
+        "@ethersproject/constants": "5.4.0",
+        "@ethersproject/contracts": "5.4.0",
+        "@ethersproject/hash": "5.4.0",
+        "@ethersproject/hdnode": "5.4.0",
+        "@ethersproject/json-wallets": "5.4.0",
+        "@ethersproject/keccak256": "5.4.0",
+        "@ethersproject/logger": "5.4.0",
+        "@ethersproject/networks": "5.4.1",
+        "@ethersproject/pbkdf2": "5.4.0",
+        "@ethersproject/properties": "5.4.0",
+        "@ethersproject/providers": "5.4.1",
+        "@ethersproject/random": "5.4.0",
+        "@ethersproject/rlp": "5.4.0",
+        "@ethersproject/sha2": "5.4.0",
+        "@ethersproject/signing-key": "5.4.0",
+        "@ethersproject/solidity": "5.4.0",
+        "@ethersproject/strings": "5.4.0",
+        "@ethersproject/transactions": "5.4.0",
+        "@ethersproject/units": "5.4.0",
+        "@ethersproject/wallet": "5.4.0",
+        "@ethersproject/web": "5.4.0",
+        "@ethersproject/wordlists": "5.4.0"
+      }
+    },
     "node_modules/event-iterator": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/event-iterator/-/event-iterator-2.0.0.tgz",
@@ -7693,6 +8472,11 @@
         "node": ">=4"
       }
     },
+    "node_modules/has-localstorage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-localstorage/-/has-localstorage-1.0.1.tgz",
+      "integrity": "sha1-/mJAbEdn+9bXhNrGkFkoEIuClxs="
+    },
     "node_modules/has-symbols": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
@@ -7722,19 +8506,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/hash.js": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
@@ -7929,6 +8700,15 @@
       "resolved": "https://registry.npmjs.org/humanize-number/-/humanize-number-0.0.2.tgz",
       "integrity": "sha1-EcCvakcWQ2M1iFiASPF5lUFInBg="
     },
+    "node_modules/humble-localstorage": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/humble-localstorage/-/humble-localstorage-1.4.2.tgz",
+      "integrity": "sha1-0Fqw1SbE7b3b98amDfb/WAUoNGk=",
+      "dependencies": {
+        "has-localstorage": "^1.0.1",
+        "localstorage-memory": "^1.0.1"
+      }
+    },
     "node_modules/husky": {
       "version": "4.3.8",
       "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz",
@@ -8975,11 +9755,12 @@
       }
     },
     "node_modules/ipfs-coord": {
-      "version": "2.1.13",
-      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-2.1.13.tgz",
-      "integrity": "sha512-k2gwHELsn+JVFLk/J1ZF2r49hre1PwMGD3xiAViKfKYChHudoKESkIfDsDYXEXUaNBUleAa6JSEh0OFS+cp9CA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-3.2.0.tgz",
+      "integrity": "sha512-OmAhpoHTmQUxFhR5Z6Cl5SnN/2PrHLD+OtGR6ffyIowMzFeCK9/cmj/0FSOLAtNBEOg0vi4F6lc3HM82cnbhnw==",
       "dependencies": {
-        "bch-encrypt-lib": "^2.0.0"
+        "bch-encrypt-lib": "^2.0.0",
+        "orbit-db": "^0.26.1"
       }
     },
     "node_modules/ipfs-core": {
@@ -9062,6 +9843,49 @@
         "peer-id": "^0.14.1"
       }
     },
+    "node_modules/ipfs-core-utils": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/ipfs-core-utils/-/ipfs-core-utils-0.4.0.tgz",
+      "integrity": "sha512-IBPFvYjWPfVFpCeYUL/0gCUOabdBhh7aO5i4tU//UlF2gVCXPH4PRYlbBH9WM83zE2+o4vDi+dBXsdAI6nLPAg==",
+      "dependencies": {
+        "blob-to-it": "0.0.2",
+        "browser-readablestream-to-it": "0.0.2",
+        "cids": "^1.0.0",
+        "err-code": "^2.0.0",
+        "ipfs-utils": "^3.0.0",
+        "it-all": "^1.0.1",
+        "it-map": "^1.0.2",
+        "it-peekable": "0.0.1",
+        "uint8arrays": "^1.1.0"
+      }
+    },
+    "node_modules/ipfs-core-utils/node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+    },
+    "node_modules/ipfs-core-utils/node_modules/multibase": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-3.1.2.tgz",
+      "integrity": "sha512-bpklWHs70LO3smJUHOjcnzGceJJvn9ui0Vau6Za0B/GBepaXswmW8Ufea0uD9pROf/qCQ4N4lZ3sf3U+SNf0tw==",
+      "dependencies": {
+        "@multiformats/base-x": "^4.0.1",
+        "web-encoding": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=10.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/ipfs-core-utils/node_modules/uint8arrays": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-1.1.0.tgz",
+      "integrity": "sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA==",
+      "dependencies": {
+        "multibase": "^3.0.0",
+        "web-encoding": "^1.0.2"
+      }
+    },
     "node_modules/ipfs-core/node_modules/any-signal": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/any-signal/-/any-signal-2.1.2.tgz",
@@ -9640,6 +10464,111 @@
       "resolved": "https://registry.npmjs.org/it-peekable/-/it-peekable-1.0.2.tgz",
       "integrity": "sha512-LRPLu94RLm+lxLZbChuc9iCXrKCOu1obWqxfaKhF00yIp30VGkl741b5P60U+rdBxuZD/Gt1bnmakernv7bVFg=="
     },
+    "node_modules/ipfs-http-client": {
+      "version": "47.0.1",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-47.0.1.tgz",
+      "integrity": "sha512-IAQf+uTLvXw5QFOzbyhu/5lH3rn7jEwwwdCGaNKVhoPI7yfyOV0wRse3hVWejjP1Id0P9mKuMKG8rhcY7pVAdQ==",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "any-signal": "^1.1.0",
+        "bignumber.js": "^9.0.0",
+        "cids": "^1.0.0",
+        "debug": "^4.1.0",
+        "form-data": "^3.0.0",
+        "ipfs-core-utils": "^0.4.0",
+        "ipfs-utils": "^3.0.0",
+        "ipld-block": "^0.10.0",
+        "ipld-dag-cbor": "^0.17.0",
+        "ipld-dag-pb": "^0.20.0",
+        "ipld-raw": "^6.0.0",
+        "iso-url": "^0.4.7",
+        "it-last": "^1.0.2",
+        "it-map": "^1.0.2",
+        "it-tar": "^1.2.2",
+        "it-to-buffer": "^1.0.0",
+        "it-to-stream": "^0.1.1",
+        "merge-options": "^2.0.0",
+        "multiaddr": "^8.0.0",
+        "multiaddr-to-uri": "^6.0.0",
+        "multibase": "^3.0.0",
+        "multicodec": "^2.0.0",
+        "multihashes": "^3.0.1",
+        "nanoid": "^3.0.2",
+        "node-fetch": "^2.6.0",
+        "parse-duration": "^0.4.4",
+        "stream-to-it": "^0.2.1",
+        "uint8arrays": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=10.3.0",
+        "npm": ">=3.0.0"
+      }
+    },
+    "node_modules/ipfs-http-client/node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ipfs-http-client/node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ipfs-http-client/node_modules/multibase": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-3.1.2.tgz",
+      "integrity": "sha512-bpklWHs70LO3smJUHOjcnzGceJJvn9ui0Vau6Za0B/GBepaXswmW8Ufea0uD9pROf/qCQ4N4lZ3sf3U+SNf0tw==",
+      "dependencies": {
+        "@multiformats/base-x": "^4.0.1",
+        "web-encoding": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=10.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/ipfs-http-client/node_modules/multicodec": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-2.1.3.tgz",
+      "integrity": "sha512-0tOH2Gtio39uO41o+2xl9UhRkCWxU5ZmZSbFCh/OjGzkWJI8e6lkN/s4Mj1YfyWoBod+2+S3W+6wO6nhkwN8pA==",
+      "dependencies": {
+        "uint8arrays": "1.1.0",
+        "varint": "^6.0.0"
+      }
+    },
+    "node_modules/ipfs-http-client/node_modules/uint8arrays": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-1.1.0.tgz",
+      "integrity": "sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA==",
+      "dependencies": {
+        "multibase": "^3.0.0",
+        "web-encoding": "^1.0.2"
+      }
+    },
+    "node_modules/ipfs-http-client/node_modules/varint": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+      "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="
+    },
     "node_modules/ipfs-http-gateway": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/ipfs-http-gateway/-/ipfs-http-gateway-0.3.2.tgz",
@@ -10080,6 +11009,92 @@
         "node": ">=10"
       }
     },
+    "node_modules/ipfs-log": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ipfs-log/-/ipfs-log-5.0.1.tgz",
+      "integrity": "sha512-n9Tf2rFqqK/r2rshQMAcS/COCwYNi8m2wCZN2ZLT9vhgXMsB1c1YEsCgZru7+cWCHTmuJwuBEjAJX9l9jQPSWw==",
+      "dependencies": {
+        "ipfs-http-client": "^47.0.1",
+        "json-stringify-deterministic": "^1.0.1",
+        "multicodec": "^2.0.1",
+        "multihashing-async": "^2.0.1",
+        "orbit-db-identity-provider": "~0.3.1",
+        "orbit-db-io": "~0.3.0",
+        "p-do-whilst": "^1.1.0",
+        "p-each-series": "^2.1.0",
+        "p-map": "^4.0.0",
+        "p-whilst": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ipfs-log/node_modules/multibase": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-3.1.2.tgz",
+      "integrity": "sha512-bpklWHs70LO3smJUHOjcnzGceJJvn9ui0Vau6Za0B/GBepaXswmW8Ufea0uD9pROf/qCQ4N4lZ3sf3U+SNf0tw==",
+      "dependencies": {
+        "@multiformats/base-x": "^4.0.1",
+        "web-encoding": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=10.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/ipfs-log/node_modules/multicodec": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-2.1.3.tgz",
+      "integrity": "sha512-0tOH2Gtio39uO41o+2xl9UhRkCWxU5ZmZSbFCh/OjGzkWJI8e6lkN/s4Mj1YfyWoBod+2+S3W+6wO6nhkwN8pA==",
+      "dependencies": {
+        "uint8arrays": "1.1.0",
+        "varint": "^6.0.0"
+      }
+    },
+    "node_modules/ipfs-log/node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ipfs-log/node_modules/uint8arrays": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-1.1.0.tgz",
+      "integrity": "sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA==",
+      "dependencies": {
+        "multibase": "^3.0.0",
+        "web-encoding": "^1.0.2"
+      }
+    },
+    "node_modules/ipfs-log/node_modules/varint": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+      "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="
+    },
+    "node_modules/ipfs-pubsub-1on1": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ipfs-pubsub-1on1/-/ipfs-pubsub-1on1-0.0.7.tgz",
+      "integrity": "sha512-j+3XefZ3xF7LlUo0cBm71aBEhVIvpwqNrtxhitkSWMkMwHUB6PfV8VSJuqUJ5lKg0t/Jo4IMDO5fdDInpUkU/Q==",
+      "dependencies": {
+        "safe-buffer": "~5.2.1"
+      }
+    },
+    "node_modules/ipfs-pubsub-peer-monitor": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/ipfs-pubsub-peer-monitor/-/ipfs-pubsub-peer-monitor-0.0.10.tgz",
+      "integrity": "sha512-9bwI02MRruP0BDR8Mn4ujboLJhJ+6nm8X6JdGHdM9P1zlfy1MSJQNOXGhk2e1FInEZvFseFLYiCFuSS1BL7BnA==",
+      "dependencies": {
+        "p-forever": "^2.1.0"
+      }
+    },
     "node_modules/ipfs-repo": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/ipfs-repo/-/ipfs-repo-8.0.0.tgz",
@@ -10611,6 +11626,30 @@
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
       "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
     },
+    "node_modules/ipfs-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ipfs-utils/-/ipfs-utils-3.0.0.tgz",
+      "integrity": "sha512-qahDc+fghrM57sbySr2TeWjaVR/RH/YEB/hvdAjiTbjESeD87qZawrXwj+19Q2LtGmFGusKNLo5wExeuI5ZfDQ==",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "any-signal": "^1.1.0",
+        "buffer": "^5.6.0",
+        "err-code": "^2.0.0",
+        "fs-extra": "^9.0.1",
+        "is-electron": "^2.2.0",
+        "iso-url": "^0.4.7",
+        "it-glob": "0.0.8",
+        "merge-options": "^2.0.0",
+        "nanoid": "^3.1.3",
+        "node-fetch": "^2.6.0",
+        "stream-to-it": "^0.2.0"
+      }
+    },
+    "node_modules/ipfs-utils/node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+    },
     "node_modules/ipfs/node_modules/ansi-regex": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -10883,6 +11922,19 @@
         "typical": "^6.0.0"
       }
     },
+    "node_modules/ipld-block": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/ipld-block/-/ipld-block-0.10.1.tgz",
+      "integrity": "sha512-lPMfW9tA2hVZw9hdO/YSppTxFmA0+5zxcefBOlCTOn+12RLyy+pdepKMbQw8u0KESFu3pYVmabNRWuFGcgHLLw==",
+      "dependencies": {
+        "cids": "^1.0.0",
+        "class-is": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0",
+        "npm": ">=3.0.0"
+      }
+    },
     "node_modules/ipld-dag-cbor": {
       "version": "0.17.1",
       "resolved": "https://registry.npmjs.org/ipld-dag-cbor/-/ipld-dag-cbor-0.17.1.tgz",
@@ -11463,6 +12515,14 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/is-node": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-node/-/is-node-1.0.2.tgz",
+      "integrity": "sha1-19ACdF733ru3R36YiVarCk/MtlM=",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/is-npm": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
@@ -11532,6 +12592,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-promise": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
+      "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU="
+    },
     "node_modules/is-regex": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
@@ -11922,6 +12987,44 @@
       "resolved": "https://registry.npmjs.org/it-first/-/it-first-1.0.6.tgz",
       "integrity": "sha512-wiI02c+G1BVuu0jz30Nsr1/et0cpSRulKUusN8HDZXxuX4MdUzfMp2P4JUk+a49Wr1kHitRLrnnh3+UzJ6neaQ=="
     },
+    "node_modules/it-glob": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.8.tgz",
+      "integrity": "sha512-PmIAgb64aJPM6wwT1UTlNDAJnNgdGrvr0vRr3AYCngcUuq1KaAovuz0dQAmUkaXudDG3EQzc7OttuLW9DaL3YQ==",
+      "dependencies": {
+        "fs-extra": "^8.1.0",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "node_modules/it-glob/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/it-glob/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/it-glob/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/it-goodbye": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/it-goodbye/-/it-goodbye-2.0.2.tgz",
@@ -12020,6 +13123,11 @@
         "it-length-prefixed": "^3.1.0"
       }
     },
+    "node_modules/it-peekable": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/it-peekable/-/it-peekable-0.0.1.tgz",
+      "integrity": "sha512-fd0JzbNldseeq+FFWthbqYB991UpKNyjPG6LqFhIOmJviCxSompMyoopKIXvLPLY+fBhhv2CT5PT31O/lEnTHw=="
+    },
     "node_modules/it-pipe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/it-pipe/-/it-pipe-1.1.0.tgz",
@@ -12088,6 +13196,14 @@
         "readable-stream": "^3.4.0"
       }
     },
+    "node_modules/it-to-buffer": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/it-to-buffer/-/it-to-buffer-1.0.5.tgz",
+      "integrity": "sha512-dczvg0VeXkfr2i2IQ3GGWEATBbk4Uggr+YnvBz76/Yp0zFJZTIOeDCz2KyFDxSDHNI62OlldbJXWmDPb5nFQeg==",
+      "dependencies": {
+        "buffer": "^5.5.0"
+      }
+    },
     "node_modules/it-to-stream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/it-to-stream/-/it-to-stream-0.1.2.tgz",
@@ -12101,19 +13217,6 @@
         "readable-stream": "^3.6.0"
       }
     },
-    "node_modules/it-to-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/it-ws": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/it-ws/-/it-ws-3.0.2.tgz",
@@ -12257,6 +13360,14 @@
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
+    "node_modules/json-stringify-deterministic": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-deterministic/-/json-stringify-deterministic-1.0.1.tgz",
+      "integrity": "sha512-9Fg0OY3uyzozpvJ8TVbUk09PjzhT7O2Q5kEe30g6OrKhbA/Is92igcx0XDDX7E3yAwnIlUcYLRl+ZkVrBYVP7A==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -12756,6 +13867,21 @@
         "lcov-parse": "bin/cli.js"
       }
     },
+    "node_modules/level": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/level/-/level-5.0.1.tgz",
+      "integrity": "sha512-wcak5OQeA4rURGacqS62R/xNHjCYnJSQDBOlm4KNUGJVE9bWv2B04TclqReYejN+oD65PzD4FsqeWoI5wNC5Lg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "level-js": "^4.0.0",
+        "level-packager": "^5.0.0",
+        "leveldown": "^5.0.0",
+        "opencollective-postinstall": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
     "node_modules/level-codec": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz",
@@ -12799,6 +13925,30 @@
         "node": ">=6"
       }
     },
+    "node_modules/level-js": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/level-js/-/level-js-4.0.2.tgz",
+      "integrity": "sha512-PeGjZsyMG4O89KHiez1zoMJxStnkM+oBIqgACjoo5PJqFiSUUm3GNod/KcbqN5ktyZa8jkG7I1T0P2u6HN9lIg==",
+      "dependencies": {
+        "abstract-leveldown": "~6.0.1",
+        "immediate": "~3.2.3",
+        "inherits": "^2.0.3",
+        "ltgt": "^2.1.2",
+        "typedarray-to-buffer": "~3.1.5"
+      }
+    },
+    "node_modules/level-js/node_modules/abstract-leveldown": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.0.3.tgz",
+      "integrity": "sha512-jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q==",
+      "dependencies": {
+        "level-concat-iterator": "~2.0.0",
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/level-packager": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz",
@@ -12837,6 +13987,70 @@
         "node": ">=6"
       }
     },
+    "node_modules/leveldown": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.1.1.tgz",
+      "integrity": "sha512-4n2R/vEA/sssh5TKtFwM9gshW2tirNoURLqekLRUUzuF+eUBLFAufO8UW7bz8lBbG2jw8tQDF3LC+LcUCc12kg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "abstract-leveldown": "~6.0.3",
+        "napi-macros": "~1.8.1",
+        "node-gyp-build": "~4.1.0"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/leveldown/node_modules/abstract-leveldown": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.0.3.tgz",
+      "integrity": "sha512-jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q==",
+      "dependencies": {
+        "level-concat-iterator": "~2.0.0",
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levelup": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.1.0.tgz",
+      "integrity": "sha512-+Qhe2/jb5affN7BeFgWUUWVdYoGXO2nFS3QLEZKZynnQyP9xqA+7wgOz3fD8SST2UKpHQuZgjyJjTcB2nMl2dQ==",
+      "dependencies": {
+        "deferred-leveldown": "~5.1.0",
+        "level-errors": "~2.0.0",
+        "level-iterator-stream": "~4.0.0",
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levelup/node_modules/abstract-leveldown": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.0.3.tgz",
+      "integrity": "sha512-jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q==",
+      "dependencies": {
+        "level-concat-iterator": "~2.0.0",
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levelup/node_modules/deferred-leveldown": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.1.0.tgz",
+      "integrity": "sha512-PvDY+BT2ONu2XVRgxHb77hYelLtMYxKSGuWuJJdVRXh9ntqx9GYTFJno/SKAz5xcd+yjQwyQeIZrUPjPvA52mg==",
+      "dependencies": {
+        "abstract-leveldown": "~6.0.0",
+        "inherits": "^2.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/leven": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
@@ -12947,6 +14161,153 @@
         "node": ">=6.0"
       }
     },
+    "node_modules/libp2p-crypto": {
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.16.3.tgz",
+      "integrity": "sha512-ro7/5Tu+f8p2+qDS1JrROnO++nNaAaBFs+VVXVHLuTMnbnMASu1eUtSlWPk1uOwikAlBFTvfqe5J1bK6Bpq6Pg==",
+      "dependencies": {
+        "asmcrypto.js": "^2.3.2",
+        "asn1.js": "^5.0.1",
+        "async": "^2.6.1",
+        "bn.js": "^4.11.8",
+        "browserify-aes": "^1.2.0",
+        "bs58": "^4.0.1",
+        "iso-random-stream": "^1.1.0",
+        "keypair": "^1.0.1",
+        "libp2p-crypto-secp256k1": "~0.3.0",
+        "multihashing-async": "~0.5.1",
+        "node-forge": "~0.9.1",
+        "pem-jwk": "^2.0.0",
+        "protons": "^1.0.1",
+        "rsa-pem-to-jwk": "^1.1.3",
+        "tweetnacl": "^1.0.0",
+        "ursa-optional": "~0.10.0"
+      },
+      "engines": {
+        "node": ">=10.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/libp2p-crypto-secp256k1": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.3.1.tgz",
+      "integrity": "sha512-evrfK/CeUSd/lcELUdDruyPBvxDmLairth75S32OLl3H+++2m2fV24JEtxzdFS9JH3xEFw0h6JFO8DBa1bP9dA==",
+      "deprecated": "Included in libp2p-crypto, use it instead. https://github.com/libp2p/js-libp2p-crypto",
+      "dependencies": {
+        "async": "^2.6.2",
+        "bs58": "^4.0.1",
+        "multihashing-async": "~0.6.0",
+        "nodeify": "^1.0.1",
+        "safe-buffer": "^5.1.2",
+        "secp256k1": "^3.6.2"
+      },
+      "engines": {
+        "node": ">=6.0.0",
+        "npm": ">=3.0.0"
+      }
+    },
+    "node_modules/libp2p-crypto-secp256k1/node_modules/async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/libp2p-crypto-secp256k1/node_modules/multibase": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
+      "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      }
+    },
+    "node_modules/libp2p-crypto-secp256k1/node_modules/multihashes": {
+      "version": "0.4.21",
+      "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz",
+      "integrity": "sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "multibase": "^0.7.0",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/libp2p-crypto-secp256k1/node_modules/multihashing-async": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.6.0.tgz",
+      "integrity": "sha512-Qv8pgg99Lewc191A5nlXy0bSd2amfqlafNJZmarU6Sj7MZVjpR94SCxQjf4DwPtgWZkiLqsjUQBXA2RSq+hYyA==",
+      "dependencies": {
+        "blakejs": "^1.1.0",
+        "js-sha3": "~0.8.0",
+        "multihashes": "~0.4.13",
+        "murmurhash3js": "^3.0.1",
+        "nodeify": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6.0.0",
+        "npm": ">=3.0.0"
+      }
+    },
+    "node_modules/libp2p-crypto/node_modules/async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/libp2p-crypto/node_modules/multibase": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
+      "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      }
+    },
+    "node_modules/libp2p-crypto/node_modules/multihashes": {
+      "version": "0.4.21",
+      "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz",
+      "integrity": "sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "multibase": "^0.7.0",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/libp2p-crypto/node_modules/multihashing-async": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.5.2.tgz",
+      "integrity": "sha512-mmyG6M/FKxrpBh9xQDUvuJ7BbqT93ZeEeH5X6LeMYKoYshYLr9BDdCsvDtZvn+Egf+/Xi+aOznrWL4vp3s+p0Q==",
+      "dependencies": {
+        "blakejs": "^1.1.0",
+        "js-sha3": "~0.8.0",
+        "multihashes": "~0.4.13",
+        "murmurhash3js": "^3.0.1",
+        "nodeify": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6.0.0",
+        "npm": ">=3.0.0"
+      }
+    },
+    "node_modules/libp2p-crypto/node_modules/protons": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/protons/-/protons-1.2.1.tgz",
+      "integrity": "sha512-2oqDyc/SN+tNcJf8XxrXhYL7sQn2/OMl8mSdD7NVGsWjMEmAbks4eDVnCyf0vAoRbBWyWTEXWk4D8XfuKVl3zg==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "protocol-buffers-schema": "^3.3.1",
+        "signed-varint": "^2.0.1",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/libp2p-crypto/node_modules/tweetnacl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
+    },
     "node_modules/libp2p-delegated-content-routing": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/libp2p-delegated-content-routing/-/libp2p-delegated-content-routing-0.9.0.tgz",
@@ -14470,6 +15831,30 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/localstorage-down": {
+      "version": "0.6.7",
+      "resolved": "https://registry.npmjs.org/localstorage-down/-/localstorage-down-0.6.7.tgz",
+      "integrity": "sha1-0Hmak7MebF+lGI7AYkLrHM6dbRU=",
+      "dependencies": {
+        "abstract-leveldown": "0.12.3",
+        "argsarray": "0.0.1",
+        "buffer-from": "^0.1.1",
+        "d64": "^1.0.0",
+        "humble-localstorage": "^1.4.2",
+        "inherits": "^2.0.1",
+        "tiny-queue": "0.2.0"
+      }
+    },
+    "node_modules/localstorage-down/node_modules/buffer-from": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz",
+      "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="
+    },
+    "node_modules/localstorage-memory": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/localstorage-memory/-/localstorage-memory-1.0.3.tgz",
+      "integrity": "sha512-t9P8WB6DcVttbw/W4PIE8HOqum8Qlvx5SjR6oInwR9Uia0EEmyUeBh7S+weKByW+l/f45Bj4L/dgZikGFDM6ng=="
+    },
     "node_modules/locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -14729,6 +16114,11 @@
         "triple-beam": "^1.3.0"
       }
     },
+    "node_modules/logplease": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/logplease/-/logplease-1.2.15.tgz",
+      "integrity": "sha512-jLlHnlsPSJjpwUfcNyUxXCl33AYg2cHhIf9QhGL2T4iPT0XPB+xP1LRKFPgIg1M/sg9kAJvy94w9CzBNrfnstA=="
+    },
     "node_modules/long": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
@@ -14761,6 +16151,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/lru": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz",
+      "integrity": "sha1-6n+4VG2DczOWoTCR12z+tMBoN9U=",
+      "dependencies": {
+        "inherits": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -15621,11 +17022,6 @@
       "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz",
       "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ=="
     },
-    "node_modules/mongoose/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
     "node_modules/mortice": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/mortice/-/mortice-2.0.1.tgz",
@@ -15909,6 +17305,14 @@
         "web-encoding": "^1.0.2"
       }
     },
+    "node_modules/murmurhash3js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/murmurhash3js/-/murmurhash3js-3.0.1.tgz",
+      "integrity": "sha1-Ppg+W0fCoG9DpxMXTn5DXKBEuZg=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/murmurhash3js-revisited": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz",
@@ -15962,6 +17366,11 @@
         "node": "^10 || ^12 || >=13.7"
       }
     },
+    "node_modules/napi-macros": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-1.8.2.tgz",
+      "integrity": "sha512-Tr0DNY4RzTaBG2W2m3l7ZtFuJChTH6VZhXVhkGGjF/4cZTt+i8GcM9ozD+30Lmr4mDoZ5Xx34t2o4GJqYWDGcg=="
+    },
     "node_modules/native-abort-controller": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/native-abort-controller/-/native-abort-controller-1.0.3.tgz",
@@ -16061,6 +17470,14 @@
         "node": "4.x || >=6.0.0"
       }
     },
+    "node_modules/node-forge": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.2.tgz",
+      "integrity": "sha512-naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw==",
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
     "node_modules/node-gyp-build": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz",
@@ -16082,6 +17499,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/nodeify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz",
+      "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=",
+      "dependencies": {
+        "is-promise": "~1.0.0",
+        "promise": "~1.3.0"
+      }
+    },
     "node_modules/nodemailer": {
       "version": "6.4.17",
       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.17.tgz",
@@ -19407,11 +20833,26 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
       "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
-      "dev": true,
       "bin": {
         "opencollective-postinstall": "index.js"
       }
     },
+    "node_modules/optimist": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
+      "dependencies": {
+        "wordwrap": "~0.0.2"
+      }
+    },
+    "node_modules/optimist/node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/optional": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz",
@@ -19435,6 +20876,191 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/orbit-db": {
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/orbit-db/-/orbit-db-0.26.1.tgz",
+      "integrity": "sha512-bp0oJdjg94Lad1Mp7XRwFatUwFgprbNTxyOuqSb8tWcWWdxWlYvG/ez9DogR9I4Lc5mbPrC7MbWeVcBIu+AeQw==",
+      "dependencies": {
+        "cids": "^1.0.0",
+        "ipfs-pubsub-1on1": "~0.0.6",
+        "is-node": "^1.0.2",
+        "localstorage-down": "^0.6.7",
+        "logplease": "^1.2.14",
+        "multihashes": "~3.0.1",
+        "orbit-db-access-controllers": "^0.3.0",
+        "orbit-db-cache": "~0.3.0",
+        "orbit-db-counterstore": "~1.12.0",
+        "orbit-db-docstore": "~1.12.0",
+        "orbit-db-eventstore": "~1.12.0",
+        "orbit-db-feedstore": "~1.12.0",
+        "orbit-db-identity-provider": "~0.3.0",
+        "orbit-db-io": "~0.3.0",
+        "orbit-db-keystore": "~0.3.0",
+        "orbit-db-kvstore": "~1.12.0",
+        "orbit-db-pubsub": "~0.6.0",
+        "orbit-db-storage-adapter": "~0.5.3",
+        "orbit-db-store": "~4.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/orbit-db-access-controllers": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-access-controllers/-/orbit-db-access-controllers-0.3.0.tgz",
+      "integrity": "sha512-H7xfgpcyAx9ToFYMvpP7StCt269uaqM33lnMdY9T1o3gbP8IYe0wPurkPQwg6IVZHrDeeBvTDA7kbOqShf9vJw==",
+      "dependencies": {
+        "orbit-db-io": "^0.3.0",
+        "p-map-series": "^1.0.0"
+      }
+    },
+    "node_modules/orbit-db-cache": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-cache/-/orbit-db-cache-0.3.0.tgz",
+      "integrity": "sha512-jUsS+D3jXCwvFy92rqvsEroBMRD1SVyBwRJO248F/0/xIJ7zg+DGmhgukivUDvCrx3cpAXqYqh3Ob+kS+K9QBA==",
+      "dependencies": {
+        "logplease": "~1.2.15"
+      }
+    },
+    "node_modules/orbit-db-counterstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-counterstore/-/orbit-db-counterstore-1.12.0.tgz",
+      "integrity": "sha512-ElaW8OXsSOORtuLREkq3IJ2xZPZXGzLZ6SUP9/VxqyNZQz+XNX7G7DE/kl4hy2kHjahF2+6M3BngJSvuJmc1Bw==",
+      "dependencies": {
+        "crdts": "~0.1.2"
+      },
+      "peerDependencies": {
+        "orbit-db-store": "4.x"
+      }
+    },
+    "node_modules/orbit-db-docstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-docstore/-/orbit-db-docstore-1.12.0.tgz",
+      "integrity": "sha512-AivU+G1y55qon2M8KY2SOV0nlCqzkc1+UpaFqtRtzH2NSPjsjnyr4Bhv+X/K+lXKQJPFnOMCiga+FspDjiKe3w==",
+      "dependencies": {
+        "p-map": "~1.1.1"
+      },
+      "peerDependencies": {
+        "orbit-db-store": "4.x"
+      }
+    },
+    "node_modules/orbit-db-docstore/node_modules/p-map": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz",
+      "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/orbit-db-eventstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-eventstore/-/orbit-db-eventstore-1.12.0.tgz",
+      "integrity": "sha512-KOTBa5Xj4EGlOEqNTNVdHeoMoJRc90x1LQrOfXKkF3XjN6qL92peIfBvVReLhbwG1mDRVdmtRpMNRcaA9eDI5Q==",
+      "peerDependencies": {
+        "orbit-db-store": "4.x"
+      }
+    },
+    "node_modules/orbit-db-feedstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-feedstore/-/orbit-db-feedstore-1.12.0.tgz",
+      "integrity": "sha512-hsNJTMb+AJI0ZeIKJVeTVngNbW9Zsh9/PF4qDFykITOwH7uqdNYosm3rR7psmmXtUmIgzPNolrHvyI2KmMsOIQ==",
+      "dependencies": {
+        "orbit-db-eventstore": "~1.12.0"
+      }
+    },
+    "node_modules/orbit-db-identity-provider": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/orbit-db-identity-provider/-/orbit-db-identity-provider-0.3.1.tgz",
+      "integrity": "sha512-kR6uUCovNecTTPTDsCkm07VEEg1nozx5bz0/ZUO7Oo+0EhCACPO9DZ3g5Wy9bPBHyaaRYqcocQfqAvTdfwyWLQ==",
+      "dependencies": {
+        "ethers": "^5.0.8",
+        "orbit-db-keystore": "~0.3.5"
+      }
+    },
+    "node_modules/orbit-db-io": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-io/-/orbit-db-io-0.3.0.tgz",
+      "integrity": "sha512-yWyhDR9vqw2+8tuOT+erKWkc9cL2QuemSVZgPjEm7nn+zkBzbacbfUdbgKtbtgUp8VDKhCzph2LfEEVhs6F5HA==",
+      "dependencies": {
+        "cids": "^1.0.0",
+        "ipld-dag-pb": "^0.20.0"
+      }
+    },
+    "node_modules/orbit-db-keystore": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/orbit-db-keystore/-/orbit-db-keystore-0.3.5.tgz",
+      "integrity": "sha512-oyu8BndnGnX+7tEHfkXBxiSPMSeztLweIUUY4OwyKysXaqd5CWvNDGT3tVZ4jq8dJ13LNmfQzdr20PjIRcBVig==",
+      "dependencies": {
+        "elliptic": "^6.5.3",
+        "level": "~5.0.1",
+        "leveldown": "~5.1.1",
+        "levelup": "~4.1.0",
+        "libp2p-crypto": "^0.16.0",
+        "libp2p-crypto-secp256k1": "^0.3.0",
+        "lru": "^3.1.0",
+        "mkdirp": "^0.5.5",
+        "safe-buffer": "^5.2.1"
+      }
+    },
+    "node_modules/orbit-db-kvstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-kvstore/-/orbit-db-kvstore-1.12.0.tgz",
+      "integrity": "sha512-v4V0bG17WhXlk5GPt9ICnP/owCds3uhIWaTgrix9nwnolfCMlX0hKDjrTrrZ8HKsTn1cm5Me/ID8i7WJvi5xoA==",
+      "peerDependencies": {
+        "orbit-db-store": "4.x"
+      }
+    },
+    "node_modules/orbit-db-pubsub": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-pubsub/-/orbit-db-pubsub-0.6.0.tgz",
+      "integrity": "sha512-+hQoeev6rl0S4805KDHVz7tU3zUk97a8udCH8LLtKG0Lh1xjc+qCIk5Pcknu6OjppkECmEz68e2wcYyfEqXufw==",
+      "dependencies": {
+        "ipfs-pubsub-peer-monitor": "~0.0.5",
+        "logplease": "~1.2.14",
+        "p-series": "^1.1.0"
+      }
+    },
+    "node_modules/orbit-db-storage-adapter": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/orbit-db-storage-adapter/-/orbit-db-storage-adapter-0.5.3.tgz",
+      "integrity": "sha512-K/YDVcKkhzEnqK1WFtjcADTtNZdskBJyaTCUY+m0dCuf39VHsXO4kRq5htpT1wJ6yI9dlG6TysVh+duA3o+Xig==",
+      "dependencies": {
+        "level": "^5.0.1",
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "node_modules/orbit-db-store": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/orbit-db-store/-/orbit-db-store-4.0.1.tgz",
+      "integrity": "sha512-6xgK4sil6BG/PFiaMOzrzYefs/c/qDwZ/328/CDcUlq5mB7+0DX7pRZa9IS2N/SjbHyIxX9DXA9FzSMcW3CW1w==",
+      "dependencies": {
+        "ipfs-log": "~5.0.0",
+        "it-to-stream": "^0.1.2",
+        "logplease": "^1.2.14",
+        "orbit-db-io": "~0.3.0",
+        "p-each-series": "^2.1.0",
+        "p-map": "^4.0.0",
+        "p-queue": "^6.6.1",
+        "readable-stream": "~3.6.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/orbit-db-store/node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -19479,11 +21105,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/p-do-whilst": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-do-whilst/-/p-do-whilst-1.1.0.tgz",
+      "integrity": "sha512-ntAQbyZJAqCBoTrW3M8XEn1+45wkWgoG6EKRKGCrSvMs0wBY2a3W3mY0I5OErEweFrQsTLAhIv3KN6yyujQnzQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/p-each-series": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
       "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -19516,6 +21149,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/p-forever": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-forever/-/p-forever-2.1.0.tgz",
+      "integrity": "sha512-kqZrNBsD8fUPCpZLYJoHTiONQVrdkA2nKwSsTfIr5h7P8jGpSy+Vzkxu6nVcZcz3c/rSx/Ys3AACd/BkMKvqbw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/p-is-promise": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz",
@@ -19555,6 +21196,25 @@
         "node": ">=6"
       }
     },
+    "node_modules/p-map-series": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz",
+      "integrity": "sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=",
+      "dependencies": {
+        "p-reduce": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-map-series/node_modules/p-reduce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
+      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/p-queue": {
       "version": "6.6.2",
       "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
@@ -19596,6 +21256,34 @@
         "node": ">=8"
       }
     },
+    "node_modules/p-series": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-series/-/p-series-1.1.0.tgz",
+      "integrity": "sha512-356covArc9UCfj2twY/sxCJKGMzzO+pJJtucizsPC6aS1xKSTBc9PQrQhvFR3+7F+fa2KBKdJjdIcv6NEWDcIQ==",
+      "dependencies": {
+        "@sindresorhus/is": "^0.7.0",
+        "p-reduce": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-series/node_modules/@sindresorhus/is": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-series/node_modules/p-reduce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
+      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/p-settle": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/p-settle/-/p-settle-4.1.1.tgz",
@@ -19704,6 +21392,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/p-whilst": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-whilst/-/p-whilst-2.1.0.tgz",
+      "integrity": "sha512-uzp1HPgqzokEmZN+VpfQ9PO4YY5xm+jpLJeL9FN1NPU4d4IZh8eEV+mtQXd+/22R1P7C5j19b7Y//oUc7k0+RQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/package-hash": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
@@ -20253,19 +21949,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/pino-pretty/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/pino-pretty/node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -20536,6 +22219,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz",
+      "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=",
+      "dependencies": {
+        "is-promise": "~1"
+      }
+    },
     "node_modules/promise-redis": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/promise-redis/-/promise-redis-0.0.5.tgz",
@@ -20789,19 +22480,6 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/rabin-wasm/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/random-bytes": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
@@ -20888,9 +22566,9 @@
       }
     },
     "node_modules/readable-stream": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-      "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -20912,19 +22590,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/readable-web-to-node-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
@@ -21338,6 +23003,34 @@
         "inherits": "^2.0.1"
       }
     },
+    "node_modules/rsa-pem-to-jwk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/rsa-pem-to-jwk/-/rsa-pem-to-jwk-1.1.3.tgz",
+      "integrity": "sha1-JF52vbfnI0z+58oDLTG1TDj6uY4=",
+      "dependencies": {
+        "object-assign": "^2.0.0",
+        "rsa-unpack": "0.0.6"
+      }
+    },
+    "node_modules/rsa-pem-to-jwk/node_modules/object-assign": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+      "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rsa-unpack": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/rsa-unpack/-/rsa-unpack-0.0.6.tgz",
+      "integrity": "sha1-9Q69VqYoN45jHylxYQJs6atO3bo=",
+      "dependencies": {
+        "optimist": "~0.3.5"
+      },
+      "bin": {
+        "rsa-unpack": "bin/cmd.js"
+      }
+    },
     "node_modules/run": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/run/-/run-1.4.0.tgz",
@@ -21379,9 +23072,23 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-      "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
@@ -21421,6 +23128,11 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
+    "node_modules/scrypt-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+      "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA=="
+    },
     "node_modules/scryptsy": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz",
@@ -21446,9 +23158,9 @@
       }
     },
     "node_modules/semantic-release": {
-      "version": "17.4.2",
-      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.4.2.tgz",
-      "integrity": "sha512-TPLWuoe2L2DmgnQEh+OLWW5V1T+ZAa1xWuHXsuPAWEko0BqSdLPl+5+BlQ+D5Bp27S5gDJ1//Y1tgbmvUhnOCw==",
+      "version": "17.4.4",
+      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.4.4.tgz",
+      "integrity": "sha512-fQIA0lw2Sy/9+TcoM/BxyzKCSwdUd8EPRwGoOuBLgxKigPCY6kaKs8TOsgUVy6QrlTYwni2yzbMb5Q2107P9eA==",
       "dev": true,
       "dependencies": {
         "@semantic-release/commit-analyzer": "^8.0.0",
@@ -21467,7 +23179,7 @@
         "git-log-parser": "^1.2.0",
         "hook-std": "^2.0.0",
         "hosted-git-info": "^4.0.0",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.21",
         "marked": "^2.0.0",
         "marked-terminal": "^4.1.1",
         "micromatch": "^4.0.2",
@@ -23407,6 +25119,11 @@
       "resolved": "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz",
       "integrity": "sha1-jru/1tYpXxNwAD+7NxYq/loKUdE="
     },
+    "node_modules/tiny-queue": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/tiny-queue/-/tiny-queue-0.2.0.tgz",
+      "integrity": "sha1-xJ/LXIdVW+G0pd9+uHEB1beLydw="
+    },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -23979,6 +25696,7 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -24381,11 +26099,23 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
       "engines": {
         "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/xdg-basedir": {
@@ -24872,6 +26602,402 @@
         }
       }
     },
+    "@ethersproject/abi": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.4.0.tgz",
+      "integrity": "sha512-9gU2H+/yK1j2eVMdzm6xvHSnMxk8waIHQGYCZg5uvAyH0rsAzxkModzBSpbAkAuhKFEovC2S9hM4nPuLym8IZw==",
+      "requires": {
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/hash": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
+    "@ethersproject/abstract-provider": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.4.0.tgz",
+      "integrity": "sha512-vPBR7HKUBY0lpdllIn7tLIzNN7DrVnhCLKSzY0l8WAwxz686m/aL7ASDzrVxV93GJtIub6N2t4dfZ29CkPOxgA==",
+      "requires": {
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/networks": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "@ethersproject/web": "^5.4.0"
+      }
+    },
+    "@ethersproject/abstract-signer": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.4.0.tgz",
+      "integrity": "sha512-AieQAzt05HJZS2bMofpuxMEp81AHufA5D6M4ScKwtolj041nrfIbIi8ciNW7+F59VYxXq+V4c3d568Q6l2m8ew==",
+      "requires": {
+        "@ethersproject/abstract-provider": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0"
+      }
+    },
+    "@ethersproject/address": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.4.0.tgz",
+      "integrity": "sha512-SD0VgOEkcACEG/C6xavlU1Hy3m5DGSXW3CUHkaaEHbAPPsgi0coP5oNPsxau8eTlZOk/bpa/hKeCNoK5IzVI2Q==",
+      "requires": {
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/rlp": "^5.4.0"
+      }
+    },
+    "@ethersproject/base64": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.4.0.tgz",
+      "integrity": "sha512-CjQw6E17QDSSC5jiM9YpF7N1aSCHmYGMt9bWD8PWv6YPMxjsys2/Q8xLrROKI3IWJ7sFfZ8B3flKDTM5wlWuZQ==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0"
+      }
+    },
+    "@ethersproject/basex": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.4.0.tgz",
+      "integrity": "sha512-J07+QCVJ7np2bcpxydFVf/CuYo9mZ7T73Pe7KQY4c1lRlrixMeblauMxHXD0MPwFmUHZIILDNViVkykFBZylbg==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0"
+      }
+    },
+    "@ethersproject/bignumber": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.4.0.tgz",
+      "integrity": "sha512-OXUu9f9hO3vGRIPxU40cignXZVaYyfx6j9NNMjebKdnaCL3anCLSSy8/b8d03vY6dh7duCC0kW72GEC4tZer2w==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "bn.js": "^4.11.9"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
+      }
+    },
+    "@ethersproject/bytes": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.4.0.tgz",
+      "integrity": "sha512-H60ceqgTHbhzOj4uRc/83SCN9d+BSUnOkrr2intevqdtEMO1JFVZ1XL84OEZV+QjV36OaZYxtnt4lGmxcGsPfA==",
+      "requires": {
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "@ethersproject/constants": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.4.0.tgz",
+      "integrity": "sha512-tzjn6S7sj9+DIIeKTJLjK9WGN2Tj0P++Z8ONEIlZjyoTkBuODN+0VfhAyYksKi43l1Sx9tX2VlFfzjfmr5Wl3Q==",
+      "requires": {
+        "@ethersproject/bignumber": "^5.4.0"
+      }
+    },
+    "@ethersproject/contracts": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.4.0.tgz",
+      "integrity": "sha512-hkO3L3IhS1Z3ZtHtaAG/T87nQ7KiPV+/qnvutag35I0IkiQ8G3ZpCQ9NNOpSCzn4pWSW4CfzmtE02FcqnLI+hw==",
+      "requires": {
+        "@ethersproject/abi": "^5.4.0",
+        "@ethersproject/abstract-provider": "^5.4.0",
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0"
+      }
+    },
+    "@ethersproject/hash": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.4.0.tgz",
+      "integrity": "sha512-xymAM9tmikKgbktOCjW60Z5sdouiIIurkZUr9oW5NOex5uwxrbsYG09kb5bMcNjlVeJD3yPivTNzViIs1GCbqA==",
+      "requires": {
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
+    "@ethersproject/hdnode": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.4.0.tgz",
+      "integrity": "sha512-pKxdS0KAaeVGfZPp1KOiDLB0jba11tG6OP1u11QnYfb7pXn6IZx0xceqWRr6ygke8+Kw74IpOoSi7/DwANhy8Q==",
+      "requires": {
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/basex": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/pbkdf2": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/sha2": "^5.4.0",
+        "@ethersproject/signing-key": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "@ethersproject/wordlists": "^5.4.0"
+      }
+    },
+    "@ethersproject/json-wallets": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.4.0.tgz",
+      "integrity": "sha512-igWcu3fx4aiczrzEHwG1xJZo9l1cFfQOWzTqwRw/xcvxTk58q4f9M7cjh51EKphMHvrJtcezJ1gf1q1AUOfEQQ==",
+      "requires": {
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/hdnode": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/pbkdf2": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/random": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "aes-js": "3.0.0",
+        "scrypt-js": "3.0.1"
+      },
+      "dependencies": {
+        "aes-js": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz",
+          "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0="
+        }
+      }
+    },
+    "@ethersproject/keccak256": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.4.0.tgz",
+      "integrity": "sha512-FBI1plWet+dPUvAzPAeHzRKiPpETQzqSUWR1wXJGHVWi4i8bOSrpC3NwpkPjgeXG7MnugVc1B42VbfnQikyC/A==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "js-sha3": "0.5.7"
+      },
+      "dependencies": {
+        "js-sha3": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+          "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc="
+        }
+      }
+    },
+    "@ethersproject/logger": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.4.0.tgz",
+      "integrity": "sha512-xYdWGGQ9P2cxBayt64d8LC8aPFJk6yWCawQi/4eJ4+oJdMMjEBMrIcIMZ9AxhwpPVmnBPrsB10PcXGmGAqgUEQ=="
+    },
+    "@ethersproject/networks": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.4.1.tgz",
+      "integrity": "sha512-8SvowCKz9Uf4xC5DTKI8+il8lWqOr78kmiqAVLYT9lzB8aSmJHQMD1GSuJI0CW4hMAnzocpGpZLgiMdzsNSPig==",
+      "requires": {
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "@ethersproject/pbkdf2": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.4.0.tgz",
+      "integrity": "sha512-x94aIv6tiA04g6BnazZSLoRXqyusawRyZWlUhKip2jvoLpzJuLb//KtMM6PEovE47pMbW+Qe1uw+68ameJjB7g==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/sha2": "^5.4.0"
+      }
+    },
+    "@ethersproject/properties": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.4.0.tgz",
+      "integrity": "sha512-7jczalGVRAJ+XSRvNA6D5sAwT4gavLq3OXPuV/74o3Rd2wuzSL035IMpIMgei4CYyBdialJMrTqkOnzccLHn4A==",
+      "requires": {
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "@ethersproject/providers": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.4.1.tgz",
+      "integrity": "sha512-p06eiFKz8nu/5Ju0kIX024gzEQIgE5pvvGrBCngpyVjpuLtUIWT3097Agw4mTn9/dEA0FMcfByzFqacBMSgCVg==",
+      "requires": {
+        "@ethersproject/abstract-provider": "^5.4.0",
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/basex": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/hash": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/networks": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/random": "^5.4.0",
+        "@ethersproject/rlp": "^5.4.0",
+        "@ethersproject/sha2": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "@ethersproject/web": "^5.4.0",
+        "bech32": "1.1.4",
+        "ws": "7.4.6"
+      }
+    },
+    "@ethersproject/random": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.4.0.tgz",
+      "integrity": "sha512-pnpWNQlf0VAZDEOVp1rsYQosmv2o0ITS/PecNw+mS2/btF8eYdspkN0vIXrCMtkX09EAh9bdk8GoXmFXM1eAKw==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "@ethersproject/rlp": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.4.0.tgz",
+      "integrity": "sha512-0I7MZKfi+T5+G8atId9QaQKHRvvasM/kqLyAH4XxBCBchAooH2EX5rL9kYZWwcm3awYV+XC7VF6nLhfeQFKVPg==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "@ethersproject/sha2": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.4.0.tgz",
+      "integrity": "sha512-siheo36r1WD7Cy+bDdE1BJ8y0bDtqXCOxRMzPa4bV1TGt/eTUUt03BHoJNB6reWJD8A30E/pdJ8WFkq+/uz4Gg==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "hash.js": "1.1.7"
+      }
+    },
+    "@ethersproject/signing-key": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.4.0.tgz",
+      "integrity": "sha512-q8POUeywx6AKg2/jX9qBYZIAmKSB4ubGXdQ88l40hmATj29JnG5pp331nAWwwxPn2Qao4JpWHNZsQN+bPiSW9A==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "bn.js": "^4.11.9",
+        "elliptic": "6.5.4",
+        "hash.js": "1.1.7"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
+      }
+    },
+    "@ethersproject/solidity": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.4.0.tgz",
+      "integrity": "sha512-XFQTZ7wFSHOhHcV1DpcWj7VXECEiSrBuv7JErJvB9Uo+KfCdc3QtUZV+Vjh/AAaYgezUEKbCtE6Khjm44seevQ==",
+      "requires": {
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/sha2": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
+    "@ethersproject/strings": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.4.0.tgz",
+      "integrity": "sha512-k/9DkH5UGDhv7aReXLluFG5ExurwtIpUfnDNhQA29w896Dw3i4uDTz01Quaptbks1Uj9kI8wo9tmW73wcIEaWA==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "@ethersproject/transactions": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.4.0.tgz",
+      "integrity": "sha512-s3EjZZt7xa4BkLknJZ98QGoIza94rVjaEed0rzZ/jB9WrIuu/1+tjvYCWzVrystXtDswy7TPBeIepyXwSYa4WQ==",
+      "requires": {
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/rlp": "^5.4.0",
+        "@ethersproject/signing-key": "^5.4.0"
+      }
+    },
+    "@ethersproject/units": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.4.0.tgz",
+      "integrity": "sha512-Z88krX40KCp+JqPCP5oPv5p750g+uU6gopDYRTBGcDvOASh6qhiEYCRatuM/suC4S2XW9Zz90QI35MfSrTIaFg==",
+      "requires": {
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/constants": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0"
+      }
+    },
+    "@ethersproject/wallet": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.4.0.tgz",
+      "integrity": "sha512-wU29majLjM6AjCjpat21mPPviG+EpK7wY1+jzKD0fg3ui5fgedf2zEu1RDgpfIMsfn8fJHJuzM4zXZ2+hSHaSQ==",
+      "requires": {
+        "@ethersproject/abstract-provider": "^5.4.0",
+        "@ethersproject/abstract-signer": "^5.4.0",
+        "@ethersproject/address": "^5.4.0",
+        "@ethersproject/bignumber": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/hash": "^5.4.0",
+        "@ethersproject/hdnode": "^5.4.0",
+        "@ethersproject/json-wallets": "^5.4.0",
+        "@ethersproject/keccak256": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/random": "^5.4.0",
+        "@ethersproject/signing-key": "^5.4.0",
+        "@ethersproject/transactions": "^5.4.0",
+        "@ethersproject/wordlists": "^5.4.0"
+      }
+    },
+    "@ethersproject/web": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.4.0.tgz",
+      "integrity": "sha512-1bUusGmcoRLYgMn6c1BLk1tOKUIFuTg8j+6N8lYlbMpDesnle+i3pGSagGNvwjaiLo4Y5gBibwctpPRmjrh4Og==",
+      "requires": {
+        "@ethersproject/base64": "^5.4.0",
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
+    "@ethersproject/wordlists": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.4.0.tgz",
+      "integrity": "sha512-FemEkf6a+EBKEPxlzeVgUaVSodU7G0Na89jqKjmWMlDB0tomoU8RlEMgUvXyqtrg8N4cwpLh8nyRnm1Nay1isA==",
+      "requires": {
+        "@ethersproject/bytes": "^5.4.0",
+        "@ethersproject/hash": "^5.4.0",
+        "@ethersproject/logger": "^5.4.0",
+        "@ethersproject/properties": "^5.4.0",
+        "@ethersproject/strings": "^5.4.0"
+      }
+    },
     "@grpc/grpc-js": {
       "version": "1.2.12",
       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.12.tgz",
@@ -25477,9 +27603,9 @@
       "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
     },
     "@psf/bch-js": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.18.0.tgz",
-      "integrity": "sha512-M+C5LdBs8ZCyIcPwHLcKWd9BWD4UBQfwgTk+VcsUtUCb/v7nYyy915/L8v4C1gOKcziwatntrHzQsmxQHRDssw==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.20.1.tgz",
+      "integrity": "sha512-U/saVHfHA0535w5Z68mHH+8emPJE6LulTcX40kWBjk3Qd3etb9S9j5aqxK0axcwN0s5o2O7AYkfF0NFwPEoa9Q==",
       "requires": {
         "@psf/bip21": "^2.0.1",
         "@psf/bip32-utils": "^1.0.0",
@@ -26442,6 +28568,21 @@
       "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.1.tgz",
       "integrity": "sha512-yml9NiDEH4M4p0G4AcPkg8AAa4mF3nfYF28VQxaokpO67j9H7gWgmsVWJ/f1Rn+PzsnDYvzJzWIQzCqDKRvWlA=="
     },
+    "abstract-leveldown": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.3.tgz",
+      "integrity": "sha1-EWsexcdxDvei1XBnaLvbREC+EHA=",
+      "requires": {
+        "xtend": "~3.0.0"
+      },
+      "dependencies": {
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo="
+        }
+      }
+    },
     "abstract-logging": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz",
@@ -26589,6 +28730,14 @@
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
       "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
     },
+    "any-signal": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/any-signal/-/any-signal-1.2.0.tgz",
+      "integrity": "sha512-Cl08k4xItix3jvu4cxO/dt2rQ6iUAjO66pTyRMub+WL1VXeAyZydCpD8GqWTPKfdL28U0R0UucmQVsUsBnvCmQ==",
+      "requires": {
+        "abort-controller": "^3.0.0"
+      }
+    },
     "anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -26688,6 +28837,11 @@
         }
       }
     },
+    "argsarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz",
+      "integrity": "sha1-bnIHtOzbObCviDA/pa4ivajfYcs="
+    },
     "argv-formatter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/argv-formatter/-/argv-formatter-1.0.0.tgz",
@@ -26762,6 +28916,11 @@
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true
     },
+    "asmcrypto.js": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/asmcrypto.js/-/asmcrypto.js-2.3.2.tgz",
+      "integrity": "sha512-3FgFARf7RupsZETQ1nHnhLUUvpcttcCq1iZCaVAbJZbCZ5VNRrNyvpDyHTOb0KC3llFcsyOT/a99NZcCbeiEsA=="
+    },
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -27149,6 +29308,14 @@
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
       "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
     },
+    "blob-to-it": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/blob-to-it/-/blob-to-it-0.0.2.tgz",
+      "integrity": "sha512-3/NRr0mUWQTkS71MYEC1teLbT5BTs7RZ6VMPXDV6qApjw3B4TAZspQuvDkYfHuD/XzL5p/RO91x5XRPeJvcCqg==",
+      "requires": {
+        "browser-readablestream-to-it": "^0.0.2"
+      }
+    },
     "bluebird": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
@@ -27171,18 +29338,6 @@
         "iso-url": "~0.4.7",
         "json-text-sequence": "~0.1.0",
         "readable-stream": "^3.6.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
       }
     },
     "bottleneck": {
@@ -27326,6 +29481,11 @@
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
     },
+    "browser-readablestream-to-it": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/browser-readablestream-to-it/-/browser-readablestream-to-it-0.0.2.tgz",
+      "integrity": "sha512-bbiTccngeAbPmpTUJcUyr6JhivADKV9xkNJVLdA91vjdzXyFBZ6fgrzElQsV3k1UNGQACRTl3p4y+cEGG9U48A=="
+    },
     "browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -28345,6 +30505,11 @@
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
       "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ="
     },
+    "crdts": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/crdts/-/crdts-0.1.5.tgz",
+      "integrity": "sha512-4Z/dQqa9qzMPlrE+zd0ecl53QFwaTZVVYTUgxvpF0k8OcOy4HY7c+C9brXp81eigLE0EKENTVp3CjIMY9b/ezg=="
+    },
     "create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
@@ -28395,6 +30560,11 @@
       "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz",
       "integrity": "sha1-PPY5FIemYppiR+sMoM4ACBt+Nho="
     },
+    "d64": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d64/-/d64-1.0.0.tgz",
+      "integrity": "sha1-QAKofoUMv8n52XBrYPymE6MzbpA="
+    },
     "dag-cbor-links": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/dag-cbor-links/-/dag-cbor-links-2.0.2.tgz",
@@ -29983,6 +32153,43 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
+    "ethers": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.4.1.tgz",
+      "integrity": "sha512-SrcddMdCgP1hukDvCPd87Aipbf4NWjQvdfAbZ65XSZGbfyuYPtIrUJPDH5B1SBRsdlfiEgX3eoz28DdBDzMNFg==",
+      "requires": {
+        "@ethersproject/abi": "5.4.0",
+        "@ethersproject/abstract-provider": "5.4.0",
+        "@ethersproject/abstract-signer": "5.4.0",
+        "@ethersproject/address": "5.4.0",
+        "@ethersproject/base64": "5.4.0",
+        "@ethersproject/basex": "5.4.0",
+        "@ethersproject/bignumber": "5.4.0",
+        "@ethersproject/bytes": "5.4.0",
+        "@ethersproject/constants": "5.4.0",
+        "@ethersproject/contracts": "5.4.0",
+        "@ethersproject/hash": "5.4.0",
+        "@ethersproject/hdnode": "5.4.0",
+        "@ethersproject/json-wallets": "5.4.0",
+        "@ethersproject/keccak256": "5.4.0",
+        "@ethersproject/logger": "5.4.0",
+        "@ethersproject/networks": "5.4.1",
+        "@ethersproject/pbkdf2": "5.4.0",
+        "@ethersproject/properties": "5.4.0",
+        "@ethersproject/providers": "5.4.1",
+        "@ethersproject/random": "5.4.0",
+        "@ethersproject/rlp": "5.4.0",
+        "@ethersproject/sha2": "5.4.0",
+        "@ethersproject/signing-key": "5.4.0",
+        "@ethersproject/solidity": "5.4.0",
+        "@ethersproject/strings": "5.4.0",
+        "@ethersproject/transactions": "5.4.0",
+        "@ethersproject/units": "5.4.0",
+        "@ethersproject/wallet": "5.4.0",
+        "@ethersproject/web": "5.4.0",
+        "@ethersproject/wordlists": "5.4.0"
+      }
+    },
     "event-iterator": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/event-iterator/-/event-iterator-2.0.0.tgz",
@@ -31197,6 +33404,11 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
+    "has-localstorage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-localstorage/-/has-localstorage-1.0.1.tgz",
+      "integrity": "sha1-/mJAbEdn+9bXhNrGkFkoEIuClxs="
+    },
     "has-symbols": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
@@ -31215,18 +33427,6 @@
         "inherits": "^2.0.4",
         "readable-stream": "^3.6.0",
         "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
       }
     },
     "hash.js": {
@@ -31392,6 +33592,15 @@
       "resolved": "https://registry.npmjs.org/humanize-number/-/humanize-number-0.0.2.tgz",
       "integrity": "sha1-EcCvakcWQ2M1iFiASPF5lUFInBg="
     },
+    "humble-localstorage": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/humble-localstorage/-/humble-localstorage-1.4.2.tgz",
+      "integrity": "sha1-0Fqw1SbE7b3b98amDfb/WAUoNGk=",
+      "requires": {
+        "has-localstorage": "^1.0.1",
+        "localstorage-memory": "^1.0.1"
+      }
+    },
     "husky": {
       "version": "4.3.8",
       "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz",
@@ -32464,11 +34673,12 @@
       }
     },
     "ipfs-coord": {
-      "version": "2.1.13",
-      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-2.1.13.tgz",
-      "integrity": "sha512-k2gwHELsn+JVFLk/J1ZF2r49hre1PwMGD3xiAViKfKYChHudoKESkIfDsDYXEXUaNBUleAa6JSEh0OFS+cp9CA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-3.2.0.tgz",
+      "integrity": "sha512-OmAhpoHTmQUxFhR5Z6Cl5SnN/2PrHLD+OtGR6ffyIowMzFeCK9/cmj/0FSOLAtNBEOg0vi4F6lc3HM82cnbhnw==",
       "requires": {
-        "bch-encrypt-lib": "^2.0.0"
+        "bch-encrypt-lib": "^2.0.0",
+        "orbit-db": "^0.26.1"
       }
     },
     "ipfs-core": {
@@ -32787,6 +34997,47 @@
         "peer-id": "^0.14.1"
       }
     },
+    "ipfs-core-utils": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/ipfs-core-utils/-/ipfs-core-utils-0.4.0.tgz",
+      "integrity": "sha512-IBPFvYjWPfVFpCeYUL/0gCUOabdBhh7aO5i4tU//UlF2gVCXPH4PRYlbBH9WM83zE2+o4vDi+dBXsdAI6nLPAg==",
+      "requires": {
+        "blob-to-it": "0.0.2",
+        "browser-readablestream-to-it": "0.0.2",
+        "cids": "^1.0.0",
+        "err-code": "^2.0.0",
+        "ipfs-utils": "^3.0.0",
+        "it-all": "^1.0.1",
+        "it-map": "^1.0.2",
+        "it-peekable": "0.0.1",
+        "uint8arrays": "^1.1.0"
+      },
+      "dependencies": {
+        "err-code": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+        },
+        "multibase": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/multibase/-/multibase-3.1.2.tgz",
+          "integrity": "sha512-bpklWHs70LO3smJUHOjcnzGceJJvn9ui0Vau6Za0B/GBepaXswmW8Ufea0uD9pROf/qCQ4N4lZ3sf3U+SNf0tw==",
+          "requires": {
+            "@multiformats/base-x": "^4.0.1",
+            "web-encoding": "^1.0.6"
+          }
+        },
+        "uint8arrays": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-1.1.0.tgz",
+          "integrity": "sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA==",
+          "requires": {
+            "multibase": "^3.0.0",
+            "web-encoding": "^1.0.2"
+          }
+        }
+      }
+    },
     "ipfs-daemon": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/ipfs-daemon/-/ipfs-daemon-0.5.4.tgz",
@@ -33056,6 +35307,94 @@
         }
       }
     },
+    "ipfs-http-client": {
+      "version": "47.0.1",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-47.0.1.tgz",
+      "integrity": "sha512-IAQf+uTLvXw5QFOzbyhu/5lH3rn7jEwwwdCGaNKVhoPI7yfyOV0wRse3hVWejjP1Id0P9mKuMKG8rhcY7pVAdQ==",
+      "requires": {
+        "abort-controller": "^3.0.0",
+        "any-signal": "^1.1.0",
+        "bignumber.js": "^9.0.0",
+        "cids": "^1.0.0",
+        "debug": "^4.1.0",
+        "form-data": "^3.0.0",
+        "ipfs-core-utils": "^0.4.0",
+        "ipfs-utils": "^3.0.0",
+        "ipld-block": "^0.10.0",
+        "ipld-dag-cbor": "^0.17.0",
+        "ipld-dag-pb": "^0.20.0",
+        "ipld-raw": "^6.0.0",
+        "iso-url": "^0.4.7",
+        "it-last": "^1.0.2",
+        "it-map": "^1.0.2",
+        "it-tar": "^1.2.2",
+        "it-to-buffer": "^1.0.0",
+        "it-to-stream": "^0.1.1",
+        "merge-options": "^2.0.0",
+        "multiaddr": "^8.0.0",
+        "multiaddr-to-uri": "^6.0.0",
+        "multibase": "^3.0.0",
+        "multicodec": "^2.0.0",
+        "multihashes": "^3.0.1",
+        "nanoid": "^3.0.2",
+        "node-fetch": "^2.6.0",
+        "parse-duration": "^0.4.4",
+        "stream-to-it": "^0.2.1",
+        "uint8arrays": "^1.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "form-data": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+          "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "multibase": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/multibase/-/multibase-3.1.2.tgz",
+          "integrity": "sha512-bpklWHs70LO3smJUHOjcnzGceJJvn9ui0Vau6Za0B/GBepaXswmW8Ufea0uD9pROf/qCQ4N4lZ3sf3U+SNf0tw==",
+          "requires": {
+            "@multiformats/base-x": "^4.0.1",
+            "web-encoding": "^1.0.6"
+          }
+        },
+        "multicodec": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-2.1.3.tgz",
+          "integrity": "sha512-0tOH2Gtio39uO41o+2xl9UhRkCWxU5ZmZSbFCh/OjGzkWJI8e6lkN/s4Mj1YfyWoBod+2+S3W+6wO6nhkwN8pA==",
+          "requires": {
+            "uint8arrays": "1.1.0",
+            "varint": "^6.0.0"
+          }
+        },
+        "uint8arrays": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-1.1.0.tgz",
+          "integrity": "sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA==",
+          "requires": {
+            "multibase": "^3.0.0",
+            "web-encoding": "^1.0.2"
+          }
+        },
+        "varint": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+          "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="
+        }
+      }
+    },
     "ipfs-http-gateway": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/ipfs-http-gateway/-/ipfs-http-gateway-0.3.2.tgz",
@@ -33452,6 +35791,81 @@
         }
       }
     },
+    "ipfs-log": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ipfs-log/-/ipfs-log-5.0.1.tgz",
+      "integrity": "sha512-n9Tf2rFqqK/r2rshQMAcS/COCwYNi8m2wCZN2ZLT9vhgXMsB1c1YEsCgZru7+cWCHTmuJwuBEjAJX9l9jQPSWw==",
+      "requires": {
+        "ipfs-http-client": "^47.0.1",
+        "json-stringify-deterministic": "^1.0.1",
+        "multicodec": "^2.0.1",
+        "multihashing-async": "^2.0.1",
+        "orbit-db-identity-provider": "~0.3.1",
+        "orbit-db-io": "~0.3.0",
+        "p-do-whilst": "^1.1.0",
+        "p-each-series": "^2.1.0",
+        "p-map": "^4.0.0",
+        "p-whilst": "^2.1.0"
+      },
+      "dependencies": {
+        "multibase": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/multibase/-/multibase-3.1.2.tgz",
+          "integrity": "sha512-bpklWHs70LO3smJUHOjcnzGceJJvn9ui0Vau6Za0B/GBepaXswmW8Ufea0uD9pROf/qCQ4N4lZ3sf3U+SNf0tw==",
+          "requires": {
+            "@multiformats/base-x": "^4.0.1",
+            "web-encoding": "^1.0.6"
+          }
+        },
+        "multicodec": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-2.1.3.tgz",
+          "integrity": "sha512-0tOH2Gtio39uO41o+2xl9UhRkCWxU5ZmZSbFCh/OjGzkWJI8e6lkN/s4Mj1YfyWoBod+2+S3W+6wO6nhkwN8pA==",
+          "requires": {
+            "uint8arrays": "1.1.0",
+            "varint": "^6.0.0"
+          }
+        },
+        "p-map": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+          "requires": {
+            "aggregate-error": "^3.0.0"
+          }
+        },
+        "uint8arrays": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-1.1.0.tgz",
+          "integrity": "sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA==",
+          "requires": {
+            "multibase": "^3.0.0",
+            "web-encoding": "^1.0.2"
+          }
+        },
+        "varint": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+          "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="
+        }
+      }
+    },
+    "ipfs-pubsub-1on1": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ipfs-pubsub-1on1/-/ipfs-pubsub-1on1-0.0.7.tgz",
+      "integrity": "sha512-j+3XefZ3xF7LlUo0cBm71aBEhVIvpwqNrtxhitkSWMkMwHUB6PfV8VSJuqUJ5lKg0t/Jo4IMDO5fdDInpUkU/Q==",
+      "requires": {
+        "safe-buffer": "~5.2.1"
+      }
+    },
+    "ipfs-pubsub-peer-monitor": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/ipfs-pubsub-peer-monitor/-/ipfs-pubsub-peer-monitor-0.0.10.tgz",
+      "integrity": "sha512-9bwI02MRruP0BDR8Mn4ujboLJhJ+6nm8X6JdGHdM9P1zlfy1MSJQNOXGhk2e1FInEZvFseFLYiCFuSS1BL7BnA==",
+      "requires": {
+        "p-forever": "^2.1.0"
+      }
+    },
     "ipfs-repo": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/ipfs-repo/-/ipfs-repo-8.0.0.tgz",
@@ -33931,6 +36345,32 @@
         }
       }
     },
+    "ipfs-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ipfs-utils/-/ipfs-utils-3.0.0.tgz",
+      "integrity": "sha512-qahDc+fghrM57sbySr2TeWjaVR/RH/YEB/hvdAjiTbjESeD87qZawrXwj+19Q2LtGmFGusKNLo5wExeuI5ZfDQ==",
+      "requires": {
+        "abort-controller": "^3.0.0",
+        "any-signal": "^1.1.0",
+        "buffer": "^5.6.0",
+        "err-code": "^2.0.0",
+        "fs-extra": "^9.0.1",
+        "is-electron": "^2.2.0",
+        "iso-url": "^0.4.7",
+        "it-glob": "0.0.8",
+        "merge-options": "^2.0.0",
+        "nanoid": "^3.1.3",
+        "node-fetch": "^2.6.0",
+        "stream-to-it": "^0.2.0"
+      },
+      "dependencies": {
+        "err-code": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+        }
+      }
+    },
     "ipld": {
       "version": "0.28.0",
       "resolved": "https://registry.npmjs.org/ipld/-/ipld-0.28.0.tgz",
@@ -33988,6 +36428,15 @@
         }
       }
     },
+    "ipld-block": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/ipld-block/-/ipld-block-0.10.1.tgz",
+      "integrity": "sha512-lPMfW9tA2hVZw9hdO/YSppTxFmA0+5zxcefBOlCTOn+12RLyy+pdepKMbQw8u0KESFu3pYVmabNRWuFGcgHLLw==",
+      "requires": {
+        "cids": "^1.0.0",
+        "class-is": "^1.1.0"
+      }
+    },
     "ipld-dag-cbor": {
       "version": "0.17.1",
       "resolved": "https://registry.npmjs.org/ipld-dag-cbor/-/ipld-dag-cbor-0.17.1.tgz",
@@ -34431,6 +36880,11 @@
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
       "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
     },
+    "is-node": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-node/-/is-node-1.0.2.tgz",
+      "integrity": "sha1-19ACdF733ru3R36YiVarCk/MtlM="
+    },
     "is-npm": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
@@ -34476,6 +36930,11 @@
       "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
       "dev": true
     },
+    "is-promise": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
+      "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU="
+    },
     "is-regex": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
@@ -34802,6 +37261,40 @@
       "resolved": "https://registry.npmjs.org/it-first/-/it-first-1.0.6.tgz",
       "integrity": "sha512-wiI02c+G1BVuu0jz30Nsr1/et0cpSRulKUusN8HDZXxuX4MdUzfMp2P4JUk+a49Wr1kHitRLrnnh3+UzJ6neaQ=="
     },
+    "it-glob": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.8.tgz",
+      "integrity": "sha512-PmIAgb64aJPM6wwT1UTlNDAJnNgdGrvr0vRr3AYCngcUuq1KaAovuz0dQAmUkaXudDG3EQzc7OttuLW9DaL3YQ==",
+      "requires": {
+        "fs-extra": "^8.1.0",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+        }
+      }
+    },
     "it-goodbye": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/it-goodbye/-/it-goodbye-2.0.2.tgz",
@@ -34902,6 +37395,11 @@
         "it-length-prefixed": "^3.1.0"
       }
     },
+    "it-peekable": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/it-peekable/-/it-peekable-0.0.1.tgz",
+      "integrity": "sha512-fd0JzbNldseeq+FFWthbqYB991UpKNyjPG6LqFhIOmJviCxSompMyoopKIXvLPLY+fBhhv2CT5PT31O/lEnTHw=="
+    },
     "it-pipe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/it-pipe/-/it-pipe-1.1.0.tgz",
@@ -34974,6 +37472,14 @@
         }
       }
     },
+    "it-to-buffer": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/it-to-buffer/-/it-to-buffer-1.0.5.tgz",
+      "integrity": "sha512-dczvg0VeXkfr2i2IQ3GGWEATBbk4Uggr+YnvBz76/Yp0zFJZTIOeDCz2KyFDxSDHNI62OlldbJXWmDPb5nFQeg==",
+      "requires": {
+        "buffer": "^5.5.0"
+      }
+    },
     "it-to-stream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/it-to-stream/-/it-to-stream-0.1.2.tgz",
@@ -34985,18 +37491,6 @@
         "p-defer": "^3.0.0",
         "p-fifo": "^1.0.0",
         "readable-stream": "^3.6.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
       }
     },
     "it-ws": {
@@ -35124,6 +37618,11 @@
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
+    "json-stringify-deterministic": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-deterministic/-/json-stringify-deterministic-1.0.1.tgz",
+      "integrity": "sha512-9Fg0OY3uyzozpvJ8TVbUk09PjzhT7O2Q5kEe30g6OrKhbA/Is92igcx0XDDX7E3yAwnIlUcYLRl+ZkVrBYVP7A=="
+    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -35538,6 +38037,17 @@
       "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=",
       "dev": true
     },
+    "level": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/level/-/level-5.0.1.tgz",
+      "integrity": "sha512-wcak5OQeA4rURGacqS62R/xNHjCYnJSQDBOlm4KNUGJVE9bWv2B04TclqReYejN+oD65PzD4FsqeWoI5wNC5Lg==",
+      "requires": {
+        "level-js": "^4.0.0",
+        "level-packager": "^5.0.0",
+        "leveldown": "^5.0.0",
+        "opencollective-postinstall": "^2.0.0"
+      }
+    },
     "level-codec": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz",
@@ -35569,6 +38079,29 @@
         "xtend": "^4.0.2"
       }
     },
+    "level-js": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/level-js/-/level-js-4.0.2.tgz",
+      "integrity": "sha512-PeGjZsyMG4O89KHiez1zoMJxStnkM+oBIqgACjoo5PJqFiSUUm3GNod/KcbqN5ktyZa8jkG7I1T0P2u6HN9lIg==",
+      "requires": {
+        "abstract-leveldown": "~6.0.1",
+        "immediate": "~3.2.3",
+        "inherits": "^2.0.3",
+        "ltgt": "^2.1.2",
+        "typedarray-to-buffer": "~3.1.5"
+      },
+      "dependencies": {
+        "abstract-leveldown": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.0.3.tgz",
+          "integrity": "sha512-jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q==",
+          "requires": {
+            "level-concat-iterator": "~2.0.0",
+            "xtend": "~4.0.0"
+          }
+        }
+      }
+    },
     "level-packager": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz",
@@ -35600,6 +38133,58 @@
         "xtend": "^4.0.2"
       }
     },
+    "leveldown": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.1.1.tgz",
+      "integrity": "sha512-4n2R/vEA/sssh5TKtFwM9gshW2tirNoURLqekLRUUzuF+eUBLFAufO8UW7bz8lBbG2jw8tQDF3LC+LcUCc12kg==",
+      "requires": {
+        "abstract-leveldown": "~6.0.3",
+        "napi-macros": "~1.8.1",
+        "node-gyp-build": "~4.1.0"
+      },
+      "dependencies": {
+        "abstract-leveldown": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.0.3.tgz",
+          "integrity": "sha512-jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q==",
+          "requires": {
+            "level-concat-iterator": "~2.0.0",
+            "xtend": "~4.0.0"
+          }
+        }
+      }
+    },
+    "levelup": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.1.0.tgz",
+      "integrity": "sha512-+Qhe2/jb5affN7BeFgWUUWVdYoGXO2nFS3QLEZKZynnQyP9xqA+7wgOz3fD8SST2UKpHQuZgjyJjTcB2nMl2dQ==",
+      "requires": {
+        "deferred-leveldown": "~5.1.0",
+        "level-errors": "~2.0.0",
+        "level-iterator-stream": "~4.0.0",
+        "xtend": "~4.0.0"
+      },
+      "dependencies": {
+        "abstract-leveldown": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.0.3.tgz",
+          "integrity": "sha512-jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q==",
+          "requires": {
+            "level-concat-iterator": "~2.0.0",
+            "xtend": "~4.0.0"
+          }
+        },
+        "deferred-leveldown": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.1.0.tgz",
+          "integrity": "sha512-PvDY+BT2ONu2XVRgxHb77hYelLtMYxKSGuWuJJdVRXh9ntqx9GYTFJno/SKAz5xcd+yjQwyQeIZrUPjPvA52mg==",
+          "requires": {
+            "abstract-leveldown": "~6.0.0",
+            "inherits": "^2.0.3"
+          }
+        }
+      }
+    },
     "leven": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
@@ -35908,6 +38493,140 @@
         }
       }
     },
+    "libp2p-crypto": {
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.16.3.tgz",
+      "integrity": "sha512-ro7/5Tu+f8p2+qDS1JrROnO++nNaAaBFs+VVXVHLuTMnbnMASu1eUtSlWPk1uOwikAlBFTvfqe5J1bK6Bpq6Pg==",
+      "requires": {
+        "asmcrypto.js": "^2.3.2",
+        "asn1.js": "^5.0.1",
+        "async": "^2.6.1",
+        "bn.js": "^4.11.8",
+        "browserify-aes": "^1.2.0",
+        "bs58": "^4.0.1",
+        "iso-random-stream": "^1.1.0",
+        "keypair": "^1.0.1",
+        "libp2p-crypto-secp256k1": "~0.3.0",
+        "multihashing-async": "~0.5.1",
+        "node-forge": "~0.9.1",
+        "pem-jwk": "^2.0.0",
+        "protons": "^1.0.1",
+        "rsa-pem-to-jwk": "^1.1.3",
+        "tweetnacl": "^1.0.0",
+        "ursa-optional": "~0.10.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "requires": {
+            "lodash": "^4.17.14"
+          }
+        },
+        "multibase": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
+          "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
+          "requires": {
+            "base-x": "^3.0.8",
+            "buffer": "^5.5.0"
+          }
+        },
+        "multihashes": {
+          "version": "0.4.21",
+          "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz",
+          "integrity": "sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw==",
+          "requires": {
+            "buffer": "^5.5.0",
+            "multibase": "^0.7.0",
+            "varint": "^5.0.0"
+          }
+        },
+        "multihashing-async": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.5.2.tgz",
+          "integrity": "sha512-mmyG6M/FKxrpBh9xQDUvuJ7BbqT93ZeEeH5X6LeMYKoYshYLr9BDdCsvDtZvn+Egf+/Xi+aOznrWL4vp3s+p0Q==",
+          "requires": {
+            "blakejs": "^1.1.0",
+            "js-sha3": "~0.8.0",
+            "multihashes": "~0.4.13",
+            "murmurhash3js": "^3.0.1",
+            "nodeify": "^1.0.1"
+          }
+        },
+        "protons": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/protons/-/protons-1.2.1.tgz",
+          "integrity": "sha512-2oqDyc/SN+tNcJf8XxrXhYL7sQn2/OMl8mSdD7NVGsWjMEmAbks4eDVnCyf0vAoRbBWyWTEXWk4D8XfuKVl3zg==",
+          "requires": {
+            "buffer": "^5.5.0",
+            "protocol-buffers-schema": "^3.3.1",
+            "signed-varint": "^2.0.1",
+            "varint": "^5.0.0"
+          }
+        },
+        "tweetnacl": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+          "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
+        }
+      }
+    },
+    "libp2p-crypto-secp256k1": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.3.1.tgz",
+      "integrity": "sha512-evrfK/CeUSd/lcELUdDruyPBvxDmLairth75S32OLl3H+++2m2fV24JEtxzdFS9JH3xEFw0h6JFO8DBa1bP9dA==",
+      "requires": {
+        "async": "^2.6.2",
+        "bs58": "^4.0.1",
+        "multihashing-async": "~0.6.0",
+        "nodeify": "^1.0.1",
+        "safe-buffer": "^5.1.2",
+        "secp256k1": "^3.6.2"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "requires": {
+            "lodash": "^4.17.14"
+          }
+        },
+        "multibase": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
+          "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
+          "requires": {
+            "base-x": "^3.0.8",
+            "buffer": "^5.5.0"
+          }
+        },
+        "multihashes": {
+          "version": "0.4.21",
+          "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz",
+          "integrity": "sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw==",
+          "requires": {
+            "buffer": "^5.5.0",
+            "multibase": "^0.7.0",
+            "varint": "^5.0.0"
+          }
+        },
+        "multihashing-async": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.6.0.tgz",
+          "integrity": "sha512-Qv8pgg99Lewc191A5nlXy0bSd2amfqlafNJZmarU6Sj7MZVjpR94SCxQjf4DwPtgWZkiLqsjUQBXA2RSq+hYyA==",
+          "requires": {
+            "blakejs": "^1.1.0",
+            "js-sha3": "~0.8.0",
+            "multihashes": "~0.4.13",
+            "murmurhash3js": "^3.0.1",
+            "nodeify": "^1.0.1"
+          }
+        }
+      }
+    },
     "libp2p-delegated-content-routing": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/libp2p-delegated-content-routing/-/libp2p-delegated-content-routing-0.9.0.tgz",
@@ -37011,6 +39730,32 @@
       "resolved": "https://registry.npmjs.org/loady/-/loady-0.0.5.tgz",
       "integrity": "sha512-uxKD2HIj042/HBx77NBcmEPsD+hxCgAtjEWlYNScuUjIsh/62Uyu39GOR68TBR68v+jqDL9zfftCWoUo4y03sQ=="
     },
+    "localstorage-down": {
+      "version": "0.6.7",
+      "resolved": "https://registry.npmjs.org/localstorage-down/-/localstorage-down-0.6.7.tgz",
+      "integrity": "sha1-0Hmak7MebF+lGI7AYkLrHM6dbRU=",
+      "requires": {
+        "abstract-leveldown": "0.12.3",
+        "argsarray": "0.0.1",
+        "buffer-from": "^0.1.1",
+        "d64": "^1.0.0",
+        "humble-localstorage": "^1.4.2",
+        "inherits": "^2.0.1",
+        "tiny-queue": "0.2.0"
+      },
+      "dependencies": {
+        "buffer-from": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz",
+          "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="
+        }
+      }
+    },
+    "localstorage-memory": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/localstorage-memory/-/localstorage-memory-1.0.3.tgz",
+      "integrity": "sha512-t9P8WB6DcVttbw/W4PIE8HOqum8Qlvx5SjR6oInwR9Uia0EEmyUeBh7S+weKByW+l/f45Bj4L/dgZikGFDM6ng=="
+    },
     "locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -37248,6 +39993,11 @@
         "triple-beam": "^1.3.0"
       }
     },
+    "logplease": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/logplease/-/logplease-1.2.15.tgz",
+      "integrity": "sha512-jLlHnlsPSJjpwUfcNyUxXCl33AYg2cHhIf9QhGL2T4iPT0XPB+xP1LRKFPgIg1M/sg9kAJvy94w9CzBNrfnstA=="
+    },
     "long": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
@@ -37274,6 +40024,14 @@
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
     },
+    "lru": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz",
+      "integrity": "sha1-6n+4VG2DczOWoTCR12z+tMBoN9U=",
+      "requires": {
+        "inherits": "^2.0.1"
+      }
+    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -37942,13 +40700,6 @@
         "safe-buffer": "5.2.1",
         "sift": "7.0.1",
         "sliced": "1.0.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
       }
     },
     "mongoose-legacy-pluralize": {
@@ -38202,6 +40953,11 @@
         }
       }
     },
+    "murmurhash3js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/murmurhash3js/-/murmurhash3js-3.0.1.tgz",
+      "integrity": "sha1-Ppg+W0fCoG9DpxMXTn5DXKBEuZg="
+    },
     "murmurhash3js-revisited": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz",
@@ -38242,6 +40998,11 @@
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
       "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="
     },
+    "napi-macros": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-1.8.2.tgz",
+      "integrity": "sha512-Tr0DNY4RzTaBG2W2m3l7ZtFuJChTH6VZhXVhkGGjF/4cZTt+i8GcM9ozD+30Lmr4mDoZ5Xx34t2o4GJqYWDGcg=="
+    },
     "native-abort-controller": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/native-abort-controller/-/native-abort-controller-1.0.3.tgz",
@@ -38334,6 +41095,11 @@
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
       "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
     },
+    "node-forge": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.2.tgz",
+      "integrity": "sha512-naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw=="
+    },
     "node-gyp-build": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz",
@@ -38347,6 +41113,15 @@
         "process-on-spawn": "^1.0.0"
       }
     },
+    "nodeify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz",
+      "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=",
+      "requires": {
+        "is-promise": "~1.0.0",
+        "promise": "~1.3.0"
+      }
+    },
     "nodemailer": {
       "version": "6.4.17",
       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.17.tgz",
@@ -40776,8 +43551,22 @@
     "opencollective-postinstall": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
-      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
-      "dev": true
+      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="
+    },
+    "optimist": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
+      "requires": {
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+        }
+      }
     },
     "optional": {
       "version": "0.1.4",
@@ -40799,6 +43588,170 @@
         "word-wrap": "^1.2.3"
       }
     },
+    "orbit-db": {
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/orbit-db/-/orbit-db-0.26.1.tgz",
+      "integrity": "sha512-bp0oJdjg94Lad1Mp7XRwFatUwFgprbNTxyOuqSb8tWcWWdxWlYvG/ez9DogR9I4Lc5mbPrC7MbWeVcBIu+AeQw==",
+      "requires": {
+        "cids": "^1.0.0",
+        "ipfs-pubsub-1on1": "~0.0.6",
+        "is-node": "^1.0.2",
+        "localstorage-down": "^0.6.7",
+        "logplease": "^1.2.14",
+        "multihashes": "~3.0.1",
+        "orbit-db-access-controllers": "^0.3.0",
+        "orbit-db-cache": "~0.3.0",
+        "orbit-db-counterstore": "~1.12.0",
+        "orbit-db-docstore": "~1.12.0",
+        "orbit-db-eventstore": "~1.12.0",
+        "orbit-db-feedstore": "~1.12.0",
+        "orbit-db-identity-provider": "~0.3.0",
+        "orbit-db-io": "~0.3.0",
+        "orbit-db-keystore": "~0.3.0",
+        "orbit-db-kvstore": "~1.12.0",
+        "orbit-db-pubsub": "~0.6.0",
+        "orbit-db-storage-adapter": "~0.5.3",
+        "orbit-db-store": "~4.0.1"
+      }
+    },
+    "orbit-db-access-controllers": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-access-controllers/-/orbit-db-access-controllers-0.3.0.tgz",
+      "integrity": "sha512-H7xfgpcyAx9ToFYMvpP7StCt269uaqM33lnMdY9T1o3gbP8IYe0wPurkPQwg6IVZHrDeeBvTDA7kbOqShf9vJw==",
+      "requires": {
+        "orbit-db-io": "^0.3.0",
+        "p-map-series": "^1.0.0"
+      }
+    },
+    "orbit-db-cache": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-cache/-/orbit-db-cache-0.3.0.tgz",
+      "integrity": "sha512-jUsS+D3jXCwvFy92rqvsEroBMRD1SVyBwRJO248F/0/xIJ7zg+DGmhgukivUDvCrx3cpAXqYqh3Ob+kS+K9QBA==",
+      "requires": {
+        "logplease": "~1.2.15"
+      }
+    },
+    "orbit-db-counterstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-counterstore/-/orbit-db-counterstore-1.12.0.tgz",
+      "integrity": "sha512-ElaW8OXsSOORtuLREkq3IJ2xZPZXGzLZ6SUP9/VxqyNZQz+XNX7G7DE/kl4hy2kHjahF2+6M3BngJSvuJmc1Bw==",
+      "requires": {
+        "crdts": "~0.1.2"
+      }
+    },
+    "orbit-db-docstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-docstore/-/orbit-db-docstore-1.12.0.tgz",
+      "integrity": "sha512-AivU+G1y55qon2M8KY2SOV0nlCqzkc1+UpaFqtRtzH2NSPjsjnyr4Bhv+X/K+lXKQJPFnOMCiga+FspDjiKe3w==",
+      "requires": {
+        "p-map": "~1.1.1"
+      },
+      "dependencies": {
+        "p-map": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz",
+          "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno="
+        }
+      }
+    },
+    "orbit-db-eventstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-eventstore/-/orbit-db-eventstore-1.12.0.tgz",
+      "integrity": "sha512-KOTBa5Xj4EGlOEqNTNVdHeoMoJRc90x1LQrOfXKkF3XjN6qL92peIfBvVReLhbwG1mDRVdmtRpMNRcaA9eDI5Q==",
+      "requires": {}
+    },
+    "orbit-db-feedstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-feedstore/-/orbit-db-feedstore-1.12.0.tgz",
+      "integrity": "sha512-hsNJTMb+AJI0ZeIKJVeTVngNbW9Zsh9/PF4qDFykITOwH7uqdNYosm3rR7psmmXtUmIgzPNolrHvyI2KmMsOIQ==",
+      "requires": {
+        "orbit-db-eventstore": "~1.12.0"
+      }
+    },
+    "orbit-db-identity-provider": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/orbit-db-identity-provider/-/orbit-db-identity-provider-0.3.1.tgz",
+      "integrity": "sha512-kR6uUCovNecTTPTDsCkm07VEEg1nozx5bz0/ZUO7Oo+0EhCACPO9DZ3g5Wy9bPBHyaaRYqcocQfqAvTdfwyWLQ==",
+      "requires": {
+        "ethers": "^5.0.8",
+        "orbit-db-keystore": "~0.3.5"
+      }
+    },
+    "orbit-db-io": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-io/-/orbit-db-io-0.3.0.tgz",
+      "integrity": "sha512-yWyhDR9vqw2+8tuOT+erKWkc9cL2QuemSVZgPjEm7nn+zkBzbacbfUdbgKtbtgUp8VDKhCzph2LfEEVhs6F5HA==",
+      "requires": {
+        "cids": "^1.0.0",
+        "ipld-dag-pb": "^0.20.0"
+      }
+    },
+    "orbit-db-keystore": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/orbit-db-keystore/-/orbit-db-keystore-0.3.5.tgz",
+      "integrity": "sha512-oyu8BndnGnX+7tEHfkXBxiSPMSeztLweIUUY4OwyKysXaqd5CWvNDGT3tVZ4jq8dJ13LNmfQzdr20PjIRcBVig==",
+      "requires": {
+        "elliptic": "^6.5.3",
+        "level": "~5.0.1",
+        "leveldown": "~5.1.1",
+        "levelup": "~4.1.0",
+        "libp2p-crypto": "^0.16.0",
+        "libp2p-crypto-secp256k1": "^0.3.0",
+        "lru": "^3.1.0",
+        "mkdirp": "^0.5.5",
+        "safe-buffer": "^5.2.1"
+      }
+    },
+    "orbit-db-kvstore": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-kvstore/-/orbit-db-kvstore-1.12.0.tgz",
+      "integrity": "sha512-v4V0bG17WhXlk5GPt9ICnP/owCds3uhIWaTgrix9nwnolfCMlX0hKDjrTrrZ8HKsTn1cm5Me/ID8i7WJvi5xoA==",
+      "requires": {}
+    },
+    "orbit-db-pubsub": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/orbit-db-pubsub/-/orbit-db-pubsub-0.6.0.tgz",
+      "integrity": "sha512-+hQoeev6rl0S4805KDHVz7tU3zUk97a8udCH8LLtKG0Lh1xjc+qCIk5Pcknu6OjppkECmEz68e2wcYyfEqXufw==",
+      "requires": {
+        "ipfs-pubsub-peer-monitor": "~0.0.5",
+        "logplease": "~1.2.14",
+        "p-series": "^1.1.0"
+      }
+    },
+    "orbit-db-storage-adapter": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/orbit-db-storage-adapter/-/orbit-db-storage-adapter-0.5.3.tgz",
+      "integrity": "sha512-K/YDVcKkhzEnqK1WFtjcADTtNZdskBJyaTCUY+m0dCuf39VHsXO4kRq5htpT1wJ6yI9dlG6TysVh+duA3o+Xig==",
+      "requires": {
+        "level": "^5.0.1",
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "orbit-db-store": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/orbit-db-store/-/orbit-db-store-4.0.1.tgz",
+      "integrity": "sha512-6xgK4sil6BG/PFiaMOzrzYefs/c/qDwZ/328/CDcUlq5mB7+0DX7pRZa9IS2N/SjbHyIxX9DXA9FzSMcW3CW1w==",
+      "requires": {
+        "ipfs-log": "~5.0.0",
+        "it-to-stream": "^0.1.2",
+        "logplease": "^1.2.14",
+        "orbit-db-io": "~0.3.0",
+        "p-each-series": "^2.1.0",
+        "p-map": "^4.0.0",
+        "p-queue": "^6.6.1",
+        "readable-stream": "~3.6.0"
+      },
+      "dependencies": {
+        "p-map": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+          "requires": {
+            "aggregate-error": "^3.0.0"
+          }
+        }
+      }
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -40830,11 +43783,15 @@
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-3.0.0.tgz",
       "integrity": "sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw=="
     },
+    "p-do-whilst": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-do-whilst/-/p-do-whilst-1.1.0.tgz",
+      "integrity": "sha512-ntAQbyZJAqCBoTrW3M8XEn1+45wkWgoG6EKRKGCrSvMs0wBY2a3W3mY0I5OErEweFrQsTLAhIv3KN6yyujQnzQ=="
+    },
     "p-each-series": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
-      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
-      "dev": true
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA=="
     },
     "p-fifo": {
       "version": "1.0.0",
@@ -40858,6 +43815,11 @@
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
+    "p-forever": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-forever/-/p-forever-2.1.0.tgz",
+      "integrity": "sha512-kqZrNBsD8fUPCpZLYJoHTiONQVrdkA2nKwSsTfIr5h7P8jGpSy+Vzkxu6nVcZcz3c/rSx/Ys3AACd/BkMKvqbw=="
+    },
     "p-is-promise": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz",
@@ -40885,6 +43847,21 @@
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
       "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="
     },
+    "p-map-series": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz",
+      "integrity": "sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=",
+      "requires": {
+        "p-reduce": "^1.0.0"
+      },
+      "dependencies": {
+        "p-reduce": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
+          "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo="
+        }
+      }
+    },
     "p-queue": {
       "version": "6.6.2",
       "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
@@ -40914,6 +43891,27 @@
         "retry": "^0.12.0"
       }
     },
+    "p-series": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-series/-/p-series-1.1.0.tgz",
+      "integrity": "sha512-356covArc9UCfj2twY/sxCJKGMzzO+pJJtucizsPC6aS1xKSTBc9PQrQhvFR3+7F+fa2KBKdJjdIcv6NEWDcIQ==",
+      "requires": {
+        "@sindresorhus/is": "^0.7.0",
+        "p-reduce": "^1.0.0"
+      },
+      "dependencies": {
+        "@sindresorhus/is": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+          "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
+        },
+        "p-reduce": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
+          "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo="
+        }
+      }
+    },
     "p-settle": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/p-settle/-/p-settle-4.1.1.tgz",
@@ -40998,6 +43996,11 @@
         "p-timeout": "^3.0.0"
       }
     },
+    "p-whilst": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-whilst/-/p-whilst-2.1.0.tgz",
+      "integrity": "sha512-uzp1HPgqzokEmZN+VpfQ9PO4YY5xm+jpLJeL9FN1NPU4d4IZh8eEV+mtQXd+/22R1P7C5j19b7Y//oUc7k0+RQ=="
+    },
     "package-hash": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
@@ -41437,16 +44440,6 @@
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
         "strip-json-comments": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -41656,6 +44649,14 @@
         "optional": "^0.1.3"
       }
     },
+    "promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz",
+      "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=",
+      "requires": {
+        "is-promise": "~1"
+      }
+    },
     "promise-redis": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/promise-redis/-/promise-redis-0.0.5.tgz",
@@ -41880,16 +44881,6 @@
           "requires": {
             "ms": "2.1.2"
           }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
         }
       }
     },
@@ -41963,9 +44954,9 @@
       }
     },
     "readable-stream": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-      "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -41979,18 +44970,6 @@
       "requires": {
         "@types/readable-stream": "^2.3.9",
         "readable-stream": "^3.6.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
       }
     },
     "readdirp": {
@@ -42331,6 +45310,30 @@
         "inherits": "^2.0.1"
       }
     },
+    "rsa-pem-to-jwk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/rsa-pem-to-jwk/-/rsa-pem-to-jwk-1.1.3.tgz",
+      "integrity": "sha1-JF52vbfnI0z+58oDLTG1TDj6uY4=",
+      "requires": {
+        "object-assign": "^2.0.0",
+        "rsa-unpack": "0.0.6"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
+        }
+      }
+    },
+    "rsa-unpack": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/rsa-unpack/-/rsa-unpack-0.0.6.tgz",
+      "integrity": "sha1-9Q69VqYoN45jHylxYQJs6atO3bo=",
+      "requires": {
+        "optimist": "~0.3.5"
+      }
+    },
     "run": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/run/-/run-1.4.0.tgz",
@@ -42363,9 +45366,9 @@
       }
     },
     "safe-buffer": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-      "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "safer-buffer": {
       "version": "2.1.2",
@@ -42402,6 +45405,11 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
+    "scrypt-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+      "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA=="
+    },
     "scryptsy": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz",
@@ -42423,9 +45431,9 @@
       }
     },
     "semantic-release": {
-      "version": "17.4.2",
-      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.4.2.tgz",
-      "integrity": "sha512-TPLWuoe2L2DmgnQEh+OLWW5V1T+ZAa1xWuHXsuPAWEko0BqSdLPl+5+BlQ+D5Bp27S5gDJ1//Y1tgbmvUhnOCw==",
+      "version": "17.4.4",
+      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.4.4.tgz",
+      "integrity": "sha512-fQIA0lw2Sy/9+TcoM/BxyzKCSwdUd8EPRwGoOuBLgxKigPCY6kaKs8TOsgUVy6QrlTYwni2yzbMb5Q2107P9eA==",
       "dev": true,
       "requires": {
         "@semantic-release/commit-analyzer": "^8.0.0",
@@ -42444,7 +45452,7 @@
         "git-log-parser": "^1.2.0",
         "hook-std": "^2.0.0",
         "hosted-git-info": "^4.0.0",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.21",
         "marked": "^2.0.0",
         "marked-terminal": "^4.1.1",
         "micromatch": "^4.0.2",
@@ -44059,6 +47067,11 @@
       "resolved": "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz",
       "integrity": "sha1-jru/1tYpXxNwAD+7NxYq/loKUdE="
     },
+    "tiny-queue": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/tiny-queue/-/tiny-queue-0.2.0.tgz",
+      "integrity": "sha1-xJ/LXIdVW+G0pd9+uHEB1beLydw="
+    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -44532,7 +47545,8 @@
     "uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true
     },
     "v8-compile-cache": {
       "version": "2.2.0",
@@ -44874,9 +47888,10 @@
       }
     },
     "ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "requires": {}
     },
     "xdg-basedir": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index c242904..951326e 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,12 @@
   },
   "repository": "Permissionless-Software-Foundation/ipfs-service-provider",
   "dependencies": {
-    "@psf/bch-js": "^4.18.0",
+    "@psf/bch-js": "^4.20.1",
     "axios": "^0.21.1",
     "bcryptjs": "^2.4.3",
     "glob": "^7.1.6",
     "ipfs": "^0.54.4",
-    "ipfs-coord": "^2.1.13",
+    "ipfs-coord": "^3.2.0",
     "jsonrpc-lite": "^2.2.0",
     "jsonwebtoken": "^8.5.1",
     "kcors": "^2.2.2",
@@ -48,7 +48,6 @@
     "mongoose": "^5.11.15",
     "nodemailer": "^6.4.17",
     "passport-local": "^1.0.0",
-    "uuid": "^8.3.2",
     "winston": "^3.3.3",
     "winston-daily-rotate-file": "^4.5.0"
   },
@@ -65,9 +64,10 @@
     "husky": "^4.3.8",
     "mocha": "^8.2.1",
     "nyc": "^15.1.0",
-    "semantic-release": "^17.4.2",
+    "semantic-release": "^17.4.4",
     "sinon": "^9.2.4",
-    "standard": "^16.0.3"
+    "standard": "^16.0.3",
+    "uuid": "^8.3.2"
   },
   "release": {
     "publish": [
diff --git a/src/adapters/index.js b/src/adapters/index.js
new file mode 100644
index 0000000..251b2f3
--- /dev/null
+++ b/src/adapters/index.js
@@ -0,0 +1,11 @@
+/*
+  This is a top-level library that encapsulates all the additional Adapters.
+  The concept of Adapters comes from Clean Architecture:
+  https://troutsblog.com/blog/clean-architecture
+*/
+
+// Individual adapter libraries.
+const IPFSAdapter = require('./ipfs')
+const ipfs = new IPFSAdapter()
+
+module.exports = { ipfs }
diff --git a/src/adapters/ipfs/index.js b/src/adapters/ipfs/index.js
new file mode 100644
index 0000000..aeccc2b
--- /dev/null
+++ b/src/adapters/ipfs/index.js
@@ -0,0 +1,43 @@
+/*
+  top-level IPFS library that combines the individual IPFS-based libraries.
+*/
+
+const IpfsAdapter = require('./ipfs')
+const IpfsCoordAdapter = require('./ipfs-coord')
+
+class IPFS {
+  constructor (localConfig) {
+    // Encapsulate dependencies
+    this.ipfsAdapter = new IpfsAdapter()
+
+    this.ipfsCoordAdapter = {} // placeholder
+
+    // Properties of this class instance.
+    this.isReady = false
+  }
+
+  // Provides a global start() function that triggers the start() function in
+  // the underlying libraries.
+  async start () {
+    try {
+      // Start IPFS
+      await this.ipfsAdapter.start()
+      console.log('IPFS is ready.')
+
+      // this.ipfs is a Promise that will resolve into an instance of an IPFS node.
+      this.ipfs = this.ipfsAdapter.ipfs
+
+      // Start ipfs-coord
+      this.ipfsCoordAdapter = new IpfsCoordAdapter({
+        ipfs: this.ipfs
+      })
+      await this.ipfsCoordAdapter.start()
+      console.log('ipfs-coord is ready.')
+    } catch (err) {
+      console.error('Error in adapters/ipfs/index.js/start()')
+      throw err
+    }
+  }
+}
+
+module.exports = IPFS
diff --git a/src/adapters/ipfs/ipfs-coord.js b/src/adapters/ipfs/ipfs-coord.js
new file mode 100644
index 0000000..2df22e8
--- /dev/null
+++ b/src/adapters/ipfs/ipfs-coord.js
@@ -0,0 +1,73 @@
+/*
+  Clean Architecture Adapter for ipfs-coord.
+  This library deals with ipfs-coord library so that the apps business logic
+  doesn't need to have any specific knowledge of the library.
+*/
+
+// Global npm libraries
+const IpfsCoord = require('ipfs-coord')
+const BCHJS = require('@psf/bch-js')
+
+// Local libraries
+const config = require('../../../config')
+// const JSONRPC = require('../../controllers/json-rpc/')
+
+let _this
+
+class IpfsCoordAdapter {
+  constructor (localConfig = {}) {
+    // Dependency injection.
+    this.ipfs = localConfig.ipfs
+    if (!this.ipfs) {
+      throw new Error(
+        'Instance of IPFS must be passed when instantiating ipfs-coord.'
+      )
+    }
+
+    // Encapsulate dependencies
+    this.IpfsCoord = IpfsCoord
+    this.bchjs = new BCHJS()
+    // this.rpc = new JSONRPC()
+    this.config = config
+
+    // Properties of this class instance.
+    this.isReady = false
+
+    _this = this
+  }
+
+  async start () {
+    this.ipfsCoord = new this.IpfsCoord({
+      ipfs: this.ipfs,
+      type: 'node.js',
+      // type: 'browser',
+      bchjs: this.bchjs,
+      privateLog: console.log, // Default to console.log
+      isCircuitRelay: this.config.isCircuitRelay,
+      apiInfo: this.config.apiInfo,
+      announceJsonLd: this.config.announceJsonLd
+    })
+
+    // Wait for the ipfs-coord library to signal that it is ready.
+    await this.ipfsCoord.isReady()
+
+    // Signal that this adapter is ready.
+    this.isReady = true
+
+    return this.isReady
+  }
+
+  // Expects router to be a function, which handles the input data from the
+  // pubsub channel. It's expected to be capable of routing JSON RPC commands.
+  attachRPCRouter (router) {
+    try {
+      _this.ipfsCoord.privateLog = router
+      _this.ipfsCoord.ipfs.orbitdb.privateLog = router
+    } catch (err) {
+      console.error('Error in attachRPCRouter()')
+      throw err
+    }
+  }
+}
+
+module.exports = IpfsCoordAdapter
diff --git a/src/adapters/ipfs/ipfs.js b/src/adapters/ipfs/ipfs.js
new file mode 100644
index 0000000..297a056
--- /dev/null
+++ b/src/adapters/ipfs/ipfs.js
@@ -0,0 +1,80 @@
+/*
+  Clean Architecture Adapter for IPFS.
+  This library deals with IPFS so that the apps business logic doesn't need
+  to have any specific knowledge of the js-ipfs library.
+*/
+
+// Global npm libraries
+const IPFS = require('ipfs')
+
+// Local libraries
+const config = require('../../../config')
+
+class IpfsAdapter {
+  constructor (localConfig) {
+    // Encapsulate dependencies
+    this.IPFS = IPFS
+
+    // Properties of this class instance.
+    this.isReady = false
+    this.config = config
+  }
+
+  // Start an IPFS node.
+  async start () {
+    try {
+      // Ipfs Options
+      const ipfsOptions = {
+        repo: './ipfsdata',
+        start: true,
+        config: {
+          relay: {
+            enabled: true, // enable circuit relay dialer and listener
+            hop: {
+              enabled: true // enable circuit relay HOP (make this node a relay)
+            }
+          },
+          pubsub: true, // enable pubsub
+          Swarm: {
+            ConnMgr: {
+              HighWater: 30,
+              LowWater: 10
+            }
+          },
+          Addresses: {
+            Swarm: [
+              `/ip4/0.0.0.0/tcp/${this.config.ipfsTcpPort}`,
+              `/ip4/0.0.0.0/tcp/${this.config.ipfsWsPort}/ws`
+            ]
+          }
+        }
+      }
+
+      // Create a new IPFS node.
+      this.ipfs = await this.IPFS.create(ipfsOptions)
+
+      // Set the 'server' profile so the node does not scan private networks.
+      await this.ipfs.config.profiles.apply('server')
+
+      // const nodeConfig = await this.ipfs.config.getAll()
+      // console.log(
+      //   `IPFS node configuration: ${JSON.stringify(nodeConfig, null, 2)}`
+      // )
+
+      // Stop the IPFS node if we're running tests.
+      if (this.config.env === 'test') {
+        await this.ipfs.stop()
+      }
+
+      // Signal that this adapter is ready.
+      this.isReady = true
+
+      return this.ipfs
+    } catch (err) {
+      console.error('Error in ipfs.js/start()')
+      throw err
+    }
+  }
+}
+
+module.exports = IpfsAdapter
diff --git a/src/controllers/index.js b/src/controllers/index.js
new file mode 100644
index 0000000..9bbf5c9
--- /dev/null
+++ b/src/controllers/index.js
@@ -0,0 +1,47 @@
+/*
+  This is a top-level library that encapsulates all the additional Controllers.
+  The concept of Controllers comes from Clean Architecture:
+  https://troutsblog.com/blog/clean-architecture
+*/
+
+// Public npm libraries.
+
+// Load the REST API Controllers.
+const boilerplateRESTControllers = require('./rest-api')
+
+// Load the Clean Architecture Adapters library
+const adapters = require('../adapters')
+
+// Load the JSON RPC Controller.
+const JSONRPC = require('./json-rpc')
+
+// Load the Clean Architecture Use Case libraries.
+const UseCases = require('../use-cases')
+const useCases = new UseCases({ adapters })
+
+// Top-level function for this library.
+// Start the various Controllers and attach them to the app.
+async function attachControllers (app) {
+  // Attach the REST controllers to the Koa app.
+  attachRESTControllers(app)
+
+  // Start IPFS.
+  await adapters.ipfs.start()
+
+  attachRPCControllers()
+}
+
+function attachRESTControllers (app) {
+  // Attach the REST API Controllers associated with the boilerplate code to the Koa app.
+  boilerplateRESTControllers.attachRESTControllers(app)
+}
+
+// Add the JSON RPC router to the ipfs-coord adapter.
+function attachRPCControllers () {
+  const jsonRpcController = new JSONRPC({ adapters, useCases })
+
+  // Attach the input of the JSON RPC router to the output of ipfs-coord.
+  adapters.ipfs.ipfsCoordAdapter.attachRPCRouter(jsonRpcController.router)
+}
+
+module.exports = { attachControllers }
diff --git a/src/controllers/json-rpc/index.js b/src/controllers/json-rpc/index.js
index 59d4a46..5bad7ff 100644
--- a/src/controllers/json-rpc/index.js
+++ b/src/controllers/json-rpc/index.js
@@ -15,15 +15,27 @@ let _this
 
 class JSONRPC {
   constructor (localConfig) {
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+      )
+    }
+
     // Encapsulate dependencies
+    this.ipfsCoord = this.adapters.ipfs.ipfsCoordAdapter.ipfsCoord
     this.jsonrpc = jsonrpc
     this.userController = new UserController()
     this.authController = new AuthController()
     this.aboutController = new AboutController()
 
-    // This will be replaced once the ipfs-coord lib finishes initializing.
-    this.ipfsCoord = {}
-
     _this = this
   }
 
diff --git a/src/controllers/rest-api/index.js b/src/controllers/rest-api/index.js
index ba933bc..e328620 100644
--- a/src/controllers/rest-api/index.js
+++ b/src/controllers/rest-api/index.js
@@ -7,40 +7,11 @@
 // Public npm libraries.
 
 // Load the REST API Controllers.
-// const EntryRESTController = require('./rest/entry')
-// const WebhookRESTController = require('./rest/webhook')
-// const PostWebhook = require('./rest/post-webhook')
 const AuthRESTController = require('./auth')
 const UserRESTController = require('./users')
 const ContactRESTController = require('./contact')
 const LogsRESTController = require('./logs')
 
-// Load the Clean Architecture Adapters library
-// const adapters = require('../adapters')
-
-// Load the JSON RPC Controller.
-// const JSONRPC = require('./json-rpc')
-
-// Load the Clean Architecture Use Case libraries.
-// const UseCases = require('../use-cases')
-// const useCases = new UseCases({ adapters })
-
-// Top-level function for this library.
-// Start the various Controllers and attach them to the app.
-async function attachControllers (app) {
-  // Attach the REST controllers to the Koa app.
-  attachRESTControllers(app)
-
-  // Start the P2WDB.
-  // await adapters.p2wdb.start()
-
-  // Start the P2WDB and attach the validation event handler/controller to
-  // the add-entry Use Case.
-  // await attachValidationController()
-
-  // attachRPCControllers()
-}
-
 function attachRESTControllers (app) {
   // Attach the REST API Controllers associated with the /auth route
   const authRESTController = new AuthRESTController()
@@ -59,45 +30,4 @@ function attachRESTControllers (app) {
   logsRESTController.attach(app)
 }
 
-// Add the JSON RPC router to the ipfs-coord adapter.
-// function attachRPCControllers () {
-//   const jsonRpcController = new JSONRPC({ adapters, useCases })
-//
-//   // Attach the input of the JSON RPC router to the output of ipfs-coord.
-//   adapters.p2wdb.ipfsAdapters.ipfsCoordAdapter.attachRPCRouter(
-//     jsonRpcController.router
-//   )
-// }
-
-// Start the P2WDB and its downstream depenencies (IPFS, ipfs-coord, OrbitDB).
-// Also attach the post-validation, peer-replication event handler (controller)
-// to the Add-Entry Use Case.
-// async function attachValidationController () {
-//   try {
-//     // Trigger the addPeerEntry() use-case after a replication-validation event.
-//     adapters.p2wdb.orbit.validationEvent.on(
-//       'ValidationSucceeded',
-//       async function (data) {
-//         try {
-//           // console.log(
-//           //   'ValidationSucceeded event triggering addPeerEntry() with this data: ',
-//           //   data
-//           // )
-//
-//           await useCases.entry.addEntry.addPeerEntry(data)
-//         } catch (err) {
-//           console.error(
-//             'Error trying to process peer data with addPeerEntry(): ',
-//             err
-//           )
-//           // Do not throw an error. This is a top-level function.
-//         }
-//       }
-//     )
-//   } catch (err) {
-//     console.error('Error in controllers/index.js/startP2wdb()')
-//     throw err
-//   }
-// }
-
-module.exports = { attachControllers }
+module.exports = { attachRESTControllers }
diff --git a/src/use-cases/index.js b/src/use-cases/index.js
new file mode 100644
index 0000000..10441ae
--- /dev/null
+++ b/src/use-cases/index.js
@@ -0,0 +1,18 @@
+/*
+  This is a top-level library that encapsulates all the additional Use Cases.
+  The concept of Use Cases comes from Clean Architecture:
+  https://troutsblog.com/blog/clean-architecture
+*/
+
+class UseCases {
+  constructor (localConfig = {}) {
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of adapters must be passed in when instantiating Use Cases library.'
+      )
+    }
+  }
+}
+
+module.exports = UseCases
diff --git a/test/unit/biz-logic/a10-rpc.unit.js b/test/unit/biz-logic/a10-rpc.unit.js
index f28752c..a5838d4 100644
--- a/test/unit/biz-logic/a10-rpc.unit.js
+++ b/test/unit/biz-logic/a10-rpc.unit.js
@@ -3,29 +3,108 @@
 */
 
 // Public npm libraries
+const assert = require('chai').assert
 const jsonrpc = require('jsonrpc-lite')
+const sinon = require('sinon')
+const { v4: uid } = require('uuid')
 
+// Set the environment variable to signal this is a test.
+process.env.SVC_ENV = 'test'
+
+// Local libraries.
 const JSONRPC = require('../../../src/controllers/json-rpc')
+const adapters = require('../mocks/adapters')
+const UseCasesMock = require('../mocks/use-cases')
 
 describe('#JSON RPC', () => {
   let uut
+  let sandbox
 
   beforeEach(() => {
-    uut = new JSONRPC()
+    sandbox = sinon.createSandbox()
+
+    const useCases = new UseCasesMock()
+    uut = new JSONRPC({ adapters, useCases })
   })
 
+  afterEach(() => sandbox.restore())
+
   describe('#router', () => {
-    it('should do something', async () => {
-      // const request = {
-      //   'users', // id
-      //   'getAll', // method
-      //   {}
-      // }
-      const json = jsonrpc.request('users', 'getAll', {})
+    it('should exit quietly if given a random string', async () => {
+      const str = 'random string message'
+      await uut.router(str)
+
+      assert.isOk('Not throwing an error is a pass.')
+    })
+
+    it('should exit quietly if invalid JSON RPC message received', async () => {
+      const malformedRpc = '{"jsonrpc":"2.0"}'
+
+      await uut.router(malformedRpc, 'peerA')
+
+      assert.isOk('Not throwing an error is a pass.')
+    })
+
+    it('should return default response if routing is not possible', async () => {
+      const id = uid()
+      const json = jsonrpc.request(id, 'unknownMethod', {})
 
       const str = JSON.stringify(json)
 
-      await uut.router(str)
+      const result = await uut.router(str, 'peerA')
+      // console.log('result: ', result)
+
+      const jsonObj = jsonrpc.parse(result.retStr)
+      // console.log(`jsonObj: ${JSON.stringify(jsonObj, null, 2)}`)
+
+      // Assert the expected properties exist on the returned object.
+      assert.property(jsonObj, 'payload')
+      assert.property(jsonObj, 'type')
+      assert.property(jsonObj.payload, 'jsonrpc')
+      assert.property(jsonObj.payload, 'id')
+      assert.property(jsonObj.payload, 'result')
+      assert.property(jsonObj.payload.result, 'reciever')
+      assert.property(jsonObj.payload.result.value, 'success')
+      assert.property(jsonObj.payload.result.value, 'message')
+
+      // Assert the expected values exist.
+      assert.equal(jsonObj.payload.id, id)
+      assert.equal(jsonObj.payload.result.value.success, false)
+      assert.equal(jsonObj.payload.result.value.status, 422)
+      assert.equal(
+        jsonObj.payload.result.value.message,
+        'Input does not match routing rules.'
+      )
+    })
+
+    it('should catch and handle errors', async () => {
+      // Force an error
+      sandbox.stub(uut.jsonrpc, 'parse').throws(new Error('test error'))
+
+      const malformedRpc = '{"jsonrpc":"2.0"}'
+
+      await uut.router(malformedRpc, 'peerA')
+
+      assert.isOk('Not throwing an error is a pass.')
+    })
+
+    it('should route to users handler', async () => {
+      const id = uid()
+      const userCall = jsonrpc.request(id, 'users', { endpoint: 'getAll' })
+      const jsonStr = JSON.stringify(userCall, null, 2)
+
+      // Mock the users controller.
+      sandbox.stub(uut.userController, 'userRouter').resolves('true')
+
+      const result = await uut.router(jsonStr, 'peerA')
+      // console.log(result)
+
+      const obj = JSON.parse(result.retStr)
+      // console.log('obj: ', obj)
+
+      assert.equal(obj.result.value, 'true')
+      assert.equal(obj.result.method, 'users')
+      assert.equal(obj.id, id)
     })
   })
 })
diff --git a/test/unit/json-rpc/a10-rpc.unit.js b/test/unit/json-rpc/a10-rpc.unit.js
index a439e0e..a5838d4 100644
--- a/test/unit/json-rpc/a10-rpc.unit.js
+++ b/test/unit/json-rpc/a10-rpc.unit.js
@@ -13,6 +13,8 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries.
 const JSONRPC = require('../../../src/controllers/json-rpc')
+const adapters = require('../mocks/adapters')
+const UseCasesMock = require('../mocks/use-cases')
 
 describe('#JSON RPC', () => {
   let uut
@@ -21,7 +23,8 @@ describe('#JSON RPC', () => {
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
-    uut = new JSONRPC()
+    const useCases = new UseCasesMock()
+    uut = new JSONRPC({ adapters, useCases })
   })
 
   afterEach(() => sandbox.restore())
diff --git a/test/unit/mocks/adapters/index.js b/test/unit/mocks/adapters/index.js
new file mode 100644
index 0000000..4e728b1
--- /dev/null
+++ b/test/unit/mocks/adapters/index.js
@@ -0,0 +1,14 @@
+/*
+  Mocks for the Adapter library.
+*/
+
+const ipfs = {
+  ipfsAdapter: {
+    ipfs: {}
+  },
+  ipfsCoordAdapter: {
+    ipfsCoord: {}
+  }
+}
+
+module.exports = { ipfs }
diff --git a/test/unit/mocks/use-cases/index.js b/test/unit/mocks/use-cases/index.js
new file mode 100644
index 0000000..fad5d8d
--- /dev/null
+++ b/test/unit/mocks/use-cases/index.js
@@ -0,0 +1,7 @@
+/*
+  Mocks for the use cases.
+*/
+
+class UseCasesMock {}
+
+module.exports = UseCasesMock

From 20cd77efa5702dbbe9128234a5a564f18331ef22 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 18:16:39 -0700
Subject: [PATCH 13/43] Moved DB models into localdb adapter

---
 config/passport.js                            | 46 +++++++++++--------
 src/adapters/index.js                         | 10 ++--
 src/adapters/localdb/index.js                 | 15 ++++++
 src/{ => adapters/localdb}/models/users.js    |  3 +-
 src/controllers/json-rpc/validators.js        |  2 +-
 .../rest-api/middleware/validators.js         |  2 +-
 src/controllers/rest-api/users/controller.js  |  2 +-
 src/lib/admin.js                              |  2 +-
 src/lib/users.js                              |  2 +-
 test/unit/json-rpc/a13-users.unit.js          |  2 +-
 test/unit/rest-api/a02-users.rest-unit.js     |  2 +-
 test/utils/test-utils.js                      |  2 +-
 12 files changed, 59 insertions(+), 31 deletions(-)
 create mode 100644 src/adapters/localdb/index.js
 rename src/{ => adapters/localdb}/models/users.js (97%)

diff --git a/config/passport.js b/config/passport.js
index 88c930a..113ee03 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -1,5 +1,5 @@
 const passport = require('koa-passport')
-const User = require('../src/models/users')
+const User = require('../src/adapters/localdb/models/users')
 const Strategy = require('passport-local')
 
 passport.serializeUser((user, done) => {
@@ -15,24 +15,34 @@ passport.deserializeUser(async (id, done) => {
   }
 })
 
-passport.use('local', new Strategy({
-  usernameField: 'email',
-  passwordField: 'password'
-}, async (email, password, done) => {
-  try {
-    const user = await User.findOne({ email })
-    if (!user) { return done(null, false) }
+passport.use(
+  'local',
+  new Strategy(
+    {
+      usernameField: 'email',
+      passwordField: 'password'
+    },
+    async (email, password, done) => {
+      try {
+        const user = await User.findOne({ email })
+        if (!user) {
+          return done(null, false)
+        }
 
-    try {
-      const isMatch = await user.validatePassword(password)
+        try {
+          const isMatch = await user.validatePassword(password)
 
-      if (!isMatch) { return done(null, false) }
+          if (!isMatch) {
+            return done(null, false)
+          }
 
-      done(null, user)
-    } catch (err) {
-      done(err)
+          done(null, user)
+        } catch (err) {
+          done(err)
+        }
+      } catch (err) {
+        return done(err)
+      }
     }
-  } catch (err) {
-    return done(err)
-  }
-}))
+  )
+)
diff --git a/src/adapters/index.js b/src/adapters/index.js
index 251b2f3..8a96f89 100644
--- a/src/adapters/index.js
+++ b/src/adapters/index.js
@@ -4,8 +4,12 @@
   https://troutsblog.com/blog/clean-architecture
 */
 
-// Individual adapter libraries.
+// Load individual adapter libraries.
 const IPFSAdapter = require('./ipfs')
-const ipfs = new IPFSAdapter()
+const LocalDB = require('./localdb')
 
-module.exports = { ipfs }
+// Instantiate adapter libraries.
+const ipfs = new IPFSAdapter()
+const localdb = new LocalDB()
+
+module.exports = { ipfs, localdb }
diff --git a/src/adapters/localdb/index.js b/src/adapters/localdb/index.js
new file mode 100644
index 0000000..1589241
--- /dev/null
+++ b/src/adapters/localdb/index.js
@@ -0,0 +1,15 @@
+/*
+  This library encapsulates code concerned with MongoDB and Mongoose models.
+*/
+
+// Load Mongoose models.
+const Users = require('./models/users')
+
+class LocalDB {
+  constructor () {
+    // Encapsulate dependencies
+    this.Users = Users
+  }
+}
+
+module.exports = LocalDB
diff --git a/src/models/users.js b/src/adapters/localdb/models/users.js
similarity index 97%
rename from src/models/users.js
rename to src/adapters/localdb/models/users.js
index 46164ed..918d294 100644
--- a/src/models/users.js
+++ b/src/adapters/localdb/models/users.js
@@ -1,6 +1,6 @@
 const mongoose = require('mongoose')
 const bcrypt = require('bcryptjs')
-const config = require('../../config')
+const config = require('../../../../config')
 const jwt = require('jsonwebtoken')
 
 const User = new mongoose.Schema({
@@ -19,7 +19,6 @@ const User = new mongoose.Schema({
       },
       message: props => `${props.value} is not a valid Email format!`
     }
-
   }
 })
 
diff --git a/src/controllers/json-rpc/validators.js b/src/controllers/json-rpc/validators.js
index 2df5f6e..7158dbf 100644
--- a/src/controllers/json-rpc/validators.js
+++ b/src/controllers/json-rpc/validators.js
@@ -8,7 +8,7 @@ const jwt = require('jsonwebtoken')
 
 // Local libraries
 const config = require('../../../config')
-const UserModel = require('../../models/users')
+const UserModel = require('../../adapters/localdb/models/users')
 
 class Validators {
   constructor () {
diff --git a/src/controllers/rest-api/middleware/validators.js b/src/controllers/rest-api/middleware/validators.js
index 80cc850..7c5c1c9 100644
--- a/src/controllers/rest-api/middleware/validators.js
+++ b/src/controllers/rest-api/middleware/validators.js
@@ -2,7 +2,7 @@
   REST API validator middleware.
 */
 
-const User = require('../../../models/users')
+const User = require('../../../adapters/localdb/models/users')
 const config = require('../../../../config')
 const getToken = require('../../../lib/auth')
 const jwt = require('jsonwebtoken')
diff --git a/src/controllers/rest-api/users/controller.js b/src/controllers/rest-api/users/controller.js
index aaa51af..47ed22b 100644
--- a/src/controllers/rest-api/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -3,7 +3,7 @@
 */
 
 // User database model.
-const UserModel = require('../../../models/users')
+const UserModel = require('../../../adapters/localdb/models/users')
 
 // User library for business logic.
 const UserLib = require('../../../lib/users')
diff --git a/src/lib/admin.js b/src/lib/admin.js
index 7b08455..18306e1 100644
--- a/src/lib/admin.js
+++ b/src/lib/admin.js
@@ -12,7 +12,7 @@
 'use strict'
 const axios = require('axios').default
 const mongoose = require('mongoose')
-const User = require('../models/users')
+const User = require('../adapters/localdb/models/users')
 const config = require('../../config')
 const JsonFiles = require('./utils/json-files')
 const jsonFiles = new JsonFiles()
diff --git a/src/lib/users.js b/src/lib/users.js
index 2f10996..c195841 100644
--- a/src/lib/users.js
+++ b/src/lib/users.js
@@ -3,7 +3,7 @@
   functions are called by the /user REST API endpoints.
 */
 
-const UserModel = require('../models/users')
+const UserModel = require('../adapters/localdb/models/users')
 const wlogger = require('./wlogger')
 
 class UserLib {
diff --git a/test/unit/json-rpc/a13-users.unit.js b/test/unit/json-rpc/a13-users.unit.js
index e8e9b1d..3d1c227 100644
--- a/test/unit/json-rpc/a13-users.unit.js
+++ b/test/unit/json-rpc/a13-users.unit.js
@@ -16,7 +16,7 @@ process.env.SVC_ENV = 'test'
 const config = require('../../../config')
 const UserRPC = require('../../../src/controllers/json-rpc/users')
 const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
-const UserModel = require('../../../src/models/users')
+const UserModel = require('../../../src/adapters/localdb/models/users')
 
 describe('#UserRPC', () => {
   let uut
diff --git a/test/unit/rest-api/a02-users.rest-unit.js b/test/unit/rest-api/a02-users.rest-unit.js
index ef87e32..9a2fe5e 100644
--- a/test/unit/rest-api/a02-users.rest-unit.js
+++ b/test/unit/rest-api/a02-users.rest-unit.js
@@ -10,7 +10,7 @@ const mongoose = require('mongoose')
 // Local support libraries
 const config = require('../../../config')
 const testUtils = require('../../utils/test-utils')
-const User = require('../../../src/models/users')
+const User = require('../../../src/adapters/localdb/models/users')
 
 const UserController = require('../../../src/controllers/rest-api/users/controller')
 let uut
diff --git a/test/utils/test-utils.js b/test/utils/test-utils.js
index 31b26b0..02d72b4 100644
--- a/test/utils/test-utils.js
+++ b/test/utils/test-utils.js
@@ -8,7 +8,7 @@ const axios = require('axios').default
 
 // Local libraries
 const config = require('../../config')
-const User = require('../../src/models/users')
+const User = require('../../src/adapters/localdb/models/users')
 
 const LOCALHOST = `http://localhost:${config.port}`
 

From b36cf15b36779236a131bcae1c444ee2195e02bd Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 19:29:49 -0700
Subject: [PATCH 14/43] injecting dependencies to controllers

---
 src/controllers/index.js          | 13 +++++---
 src/controllers/rest-api/index.js | 51 ++++++++++++++++++++++---------
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/controllers/index.js b/src/controllers/index.js
index 9bbf5c9..1692740 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -6,9 +6,6 @@
 
 // Public npm libraries.
 
-// Load the REST API Controllers.
-const boilerplateRESTControllers = require('./rest-api')
-
 // Load the Clean Architecture Adapters library
 const adapters = require('../adapters')
 
@@ -19,6 +16,9 @@ const JSONRPC = require('./json-rpc')
 const UseCases = require('../use-cases')
 const useCases = new UseCases({ adapters })
 
+// Load the REST API Controllers.
+const RESTControllers = require('./rest-api')
+
 // Top-level function for this library.
 // Start the various Controllers and attach them to the app.
 async function attachControllers (app) {
@@ -32,8 +32,13 @@ async function attachControllers (app) {
 }
 
 function attachRESTControllers (app) {
+  const rESTControllers = new RESTControllers({
+    adapters,
+    useCases
+  })
+
   // Attach the REST API Controllers associated with the boilerplate code to the Koa app.
-  boilerplateRESTControllers.attachRESTControllers(app)
+  rESTControllers.attachRESTControllers(app)
 }
 
 // Add the JSON RPC router to the ipfs-coord adapter.
diff --git a/src/controllers/rest-api/index.js b/src/controllers/rest-api/index.js
index e328620..49ca36a 100644
--- a/src/controllers/rest-api/index.js
+++ b/src/controllers/rest-api/index.js
@@ -12,22 +12,45 @@ const UserRESTController = require('./users')
 const ContactRESTController = require('./contact')
 const LogsRESTController = require('./logs')
 
-function attachRESTControllers (app) {
-  // Attach the REST API Controllers associated with the /auth route
-  const authRESTController = new AuthRESTController()
-  authRESTController.attach(app)
+class RESTControllers {
+  constructor (localConfig) {
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+      )
+    }
+  }
 
-  // Attach the REST API Controllers associated with the /user route
-  const userRESTController = new UserRESTController()
-  userRESTController.attach(app)
+  attachRESTControllers (app) {
+    const dependencies = {
+      adapters: this.adapters,
+      useCases: this.useCases
+    }
 
-  // Attach the REST API Controllers associated with the /contact route
-  const contactRESTController = new ContactRESTController()
-  contactRESTController.attach(app)
+    // Attach the REST API Controllers associated with the /auth route
+    const authRESTController = new AuthRESTController(dependencies)
+    authRESTController.attach(app)
 
-  // Attach the REST API Controllers associated with the /logs route
-  const logsRESTController = new LogsRESTController()
-  logsRESTController.attach(app)
+    // Attach the REST API Controllers associated with the /user route
+    const userRESTController = new UserRESTController(dependencies)
+    userRESTController.attach(app)
+
+    // Attach the REST API Controllers associated with the /contact route
+    const contactRESTController = new ContactRESTController(dependencies)
+    contactRESTController.attach(app)
+
+    // Attach the REST API Controllers associated with the /logs route
+    const logsRESTController = new LogsRESTController(dependencies)
+    logsRESTController.attach(app)
+  }
 }
 
-module.exports = { attachRESTControllers }
+module.exports = RESTControllers

From b2e455ffccafb506f6fa9b40e002037d9d287df1 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 07:58:33 -0700
Subject: [PATCH 15/43] Moved logapi lib to adapter dir

---
 src/adapters/index.js                       |   4 +-
 src/{lib => adapters}/logapi.js             |   0
 src/controllers/rest-api/logs/controller.js |   2 +-
 src/lib/ipfs.js                             | 119 --------------------
 test/unit/biz-logic/a06-logapi.lib-unit.js  |   2 +-
 5 files changed, 5 insertions(+), 122 deletions(-)
 rename src/{lib => adapters}/logapi.js (100%)
 delete mode 100644 src/lib/ipfs.js

diff --git a/src/adapters/index.js b/src/adapters/index.js
index 8a96f89..106a1cd 100644
--- a/src/adapters/index.js
+++ b/src/adapters/index.js
@@ -7,9 +7,11 @@
 // Load individual adapter libraries.
 const IPFSAdapter = require('./ipfs')
 const LocalDB = require('./localdb')
+const LogsAPI = require('./logapi')
 
 // Instantiate adapter libraries.
 const ipfs = new IPFSAdapter()
 const localdb = new LocalDB()
+const logapi = new LogsAPI()
 
-module.exports = { ipfs, localdb }
+module.exports = { ipfs, localdb, logapi }
diff --git a/src/lib/logapi.js b/src/adapters/logapi.js
similarity index 100%
rename from src/lib/logapi.js
rename to src/adapters/logapi.js
diff --git a/src/controllers/rest-api/logs/controller.js b/src/controllers/rest-api/logs/controller.js
index 2e5d710..c8a2398 100644
--- a/src/controllers/rest-api/logs/controller.js
+++ b/src/controllers/rest-api/logs/controller.js
@@ -1,4 +1,4 @@
-const LogsApiLib = require('../../../lib/logapi')
+const LogsApiLib = require('../../../adapters/logapi')
 const logsApiLib = new LogsApiLib()
 let _this
 
diff --git a/src/lib/ipfs.js b/src/lib/ipfs.js
deleted file mode 100644
index 22c1df8..0000000
--- a/src/lib/ipfs.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-  This support library handles the connection to the IPFS network. It instantiates
-  the IPFS node and starts the ipfs-coord library.
-*/
-
-// Global npm libraries
-const IPFS = require('ipfs')
-const IpfsCoord = require('ipfs-coord')
-// const IpfsCoord = require('../../../ipfs-coord')
-const BCHJS = require('@psf/bch-js')
-
-// Local libraries
-const config = require('../../config')
-const JSONRPC = require('../controllers/json-rpc')
-
-class IPFSLib {
-  constructor (localConfig) {
-    // Encapsulate dependencies
-    this.IPFS = IPFS
-    this.IpfsCoord = IpfsCoord
-    this.bchjs = new BCHJS()
-    this.rpc = new JSONRPC()
-    this.config = config
-
-    // this.rpc = {}
-    // if (localConfig.rpc) {
-    //   this.rpc = localConfig.rpc
-    // }
-  }
-
-  // This is a 'macro' start method. It kicks off several smaller methods that
-  // start the various subcomponents of this IPFS library.
-  async start () {
-    try {
-      await this.startIpfs()
-      await this.startIpfsCoord()
-
-      // Update the RPC instance with the instance of ipfs-coord.
-      this.rpc.ipfsCoord = this.ipfsCoord
-
-      console.log('IPFS is ready.')
-    } catch (err) {
-      console.error('Error trying to start IPFS: ', err)
-
-      // Added the exit() call because this app has been observed crashing due
-      // to out-of-memory errors. IPFS is a memory hog. It then can't automatically
-      // restart due to an IPFS lock-file error. Exiting the app will give a
-      // process management like pm2 or systemd to successfully restart the app.
-      console.log('Shutting down app. Hopefully pm2 can restart it!')
-      process.exit(1)
-    }
-  }
-
-  async startIpfs () {
-    try {
-      // Ipfs Options
-      const ipfsOptions = {
-        repo: './ipfsdata',
-        start: true,
-        config: {
-          relay: {
-            enabled: true, // enable circuit relay dialer and listener
-            hop: {
-              enabled: true // enable circuit relay HOP (make this node a relay)
-            }
-          },
-          pubsub: true, // enable pubsub
-          Swarm: {
-            ConnMgr: {
-              HighWater: 30,
-              LowWater: 10
-            }
-          }
-        }
-      }
-
-      // Create a new IPFS node.
-      this.ipfs = await this.IPFS.create(ipfsOptions)
-
-      // Set the 'server' profile so the node does not scan private networks.
-      await this.ipfs.config.profiles.apply('server')
-
-      // const nodeConfig = await this.ipfs.config.getAll()
-      // console.log(
-      //   `IPFS node configuration: ${JSON.stringify(nodeConfig, null, 2)}`
-      // )
-
-      // Stop the IPFS node if we're running tests.
-      if (this.config.env === 'test') {
-        await this.ipfs.stop()
-      }
-    } catch (err) {
-      console.error('Error in startIpfs()')
-      throw err
-    }
-  }
-
-  async startIpfsCoord () {
-    try {
-      this.ipfsCoord = new this.IpfsCoord({
-        ipfs: this.ipfs,
-        type: 'node.js',
-        // type: 'browser',
-        bchjs: this.bchjs,
-        privateLog: this.rpc.router,
-        isCircuitRelay: this.config.isCircuitRelay,
-        apiInfo: this.config.apiInfo,
-        announceJsonLd: this.config.announceJsonLd
-      })
-
-      await this.ipfsCoord.isReady()
-    } catch (err) {
-      console.error('Error in startIpfsCoord()')
-      throw err
-    }
-  }
-}
-
-module.exports = IPFSLib
diff --git a/test/unit/biz-logic/a06-logapi.lib-unit.js b/test/unit/biz-logic/a06-logapi.lib-unit.js
index 19b3390..4563a69 100644
--- a/test/unit/biz-logic/a06-logapi.lib-unit.js
+++ b/test/unit/biz-logic/a06-logapi.lib-unit.js
@@ -5,7 +5,7 @@ const sinon = require('sinon')
 const util = require('util')
 util.inspect.defaultOptions = { depth: 1 }
 
-const LogsApiLib = require('../../../src/lib/logapi')
+const LogsApiLib = require('../../../src/adapters/logapi')
 const mockData = require('../mocks/log-api-mock')
 
 const context = {}

From ef81744862d5617d2f6ac19df1b1c3590165e8c1 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 08:01:22 -0700
Subject: [PATCH 16/43] Moved password lib to adapters dir

---
 src/{lib => adapters}/passport.js            | 0
 src/controllers/rest-api/auth/controller.js  | 2 +-
 test/unit/biz-logic/a05-passport.lib-unit.js | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{lib => adapters}/passport.js (100%)

diff --git a/src/lib/passport.js b/src/adapters/passport.js
similarity index 100%
rename from src/lib/passport.js
rename to src/adapters/passport.js
diff --git a/src/controllers/rest-api/auth/controller.js b/src/controllers/rest-api/auth/controller.js
index 52cdeeb..a799d54 100644
--- a/src/controllers/rest-api/auth/controller.js
+++ b/src/controllers/rest-api/auth/controller.js
@@ -1,4 +1,4 @@
-const Passport = require('../../../lib/passport')
+const Passport = require('../../../adapters/passport')
 const passport = new Passport()
 
 let _this
diff --git a/test/unit/biz-logic/a05-passport.lib-unit.js b/test/unit/biz-logic/a05-passport.lib-unit.js
index a7d3e51..eefb4b5 100644
--- a/test/unit/biz-logic/a05-passport.lib-unit.js
+++ b/test/unit/biz-logic/a05-passport.lib-unit.js
@@ -1,5 +1,5 @@
 const assert = require('chai').assert
-const PassportLib = require('../../../src/lib/passport')
+const PassportLib = require('../../../src/adapters/passport')
 
 const sinon = require('sinon')
 

From c838f22bac570e2f0c439f8e812a561712fc94c9 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 08:09:25 -0700
Subject: [PATCH 17/43] Moved wlogger lib to adapters dir

---
 bin/server.js                                     | 2 +-
 src/{lib => adapters}/nodemailer.js               | 0
 src/{lib => adapters}/wlogger.js                  | 0
 src/controllers/json-rpc/auth/index.js            | 2 +-
 src/controllers/json-rpc/index.js                 | 2 +-
 src/controllers/rest-api/middleware/validators.js | 2 +-
 src/controllers/rest-api/users/controller.js      | 2 +-
 src/lib/contact.js                                | 4 ++--
 src/lib/users.js                                  | 2 +-
 test/unit/biz-logic/a03-nodemailer.lib-unit.js    | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{lib => adapters}/nodemailer.js (100%)
 rename src/{lib => adapters}/wlogger.js (100%)

diff --git a/bin/server.js b/bin/server.js
index f3b7b6a..90324a1 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -19,7 +19,7 @@ const adminLib = new AdminLib()
 // const rpc = new JSONRPC()
 
 const errorMiddleware = require('../src/controllers/rest-api/middleware/error')
-const wlogger = require('../src/lib/wlogger')
+const wlogger = require('../src/adapters/wlogger')
 
 async function startServer () {
   // Create a Koa instance.
diff --git a/src/lib/nodemailer.js b/src/adapters/nodemailer.js
similarity index 100%
rename from src/lib/nodemailer.js
rename to src/adapters/nodemailer.js
diff --git a/src/lib/wlogger.js b/src/adapters/wlogger.js
similarity index 100%
rename from src/lib/wlogger.js
rename to src/adapters/wlogger.js
diff --git a/src/controllers/json-rpc/auth/index.js b/src/controllers/json-rpc/auth/index.js
index 4ab1a14..1ba6d6e 100644
--- a/src/controllers/json-rpc/auth/index.js
+++ b/src/controllers/json-rpc/auth/index.js
@@ -8,7 +8,7 @@ const jsonrpc = require('jsonrpc-lite')
 // Local libraries
 // const AuthLib = require('../../lib/auth')
 const UserLib = require('../../../lib/users')
-const wlogger = require('../../../lib/wlogger')
+const wlogger = require('../../../adapters/wlogger')
 const RateLimit = require('../rate-limit')
 
 class AuthRPC {
diff --git a/src/controllers/json-rpc/index.js b/src/controllers/json-rpc/index.js
index 5bad7ff..b56c04d 100644
--- a/src/controllers/json-rpc/index.js
+++ b/src/controllers/json-rpc/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local support libraries
-const wlogger = require('../../lib/wlogger')
+const wlogger = require('../../adapters/wlogger')
 const UserController = require('./users')
 const AuthController = require('./auth')
 const AboutController = require('./about')
diff --git a/src/controllers/rest-api/middleware/validators.js b/src/controllers/rest-api/middleware/validators.js
index 7c5c1c9..47aa3a3 100644
--- a/src/controllers/rest-api/middleware/validators.js
+++ b/src/controllers/rest-api/middleware/validators.js
@@ -6,7 +6,7 @@ const User = require('../../../adapters/localdb/models/users')
 const config = require('../../../../config')
 const getToken = require('../../../lib/auth')
 const jwt = require('jsonwebtoken')
-const wlogger = require('../../../lib/wlogger')
+const wlogger = require('../../../adapters/wlogger')
 
 let _this
 
diff --git a/src/controllers/rest-api/users/controller.js b/src/controllers/rest-api/users/controller.js
index 47ed22b..f2e981b 100644
--- a/src/controllers/rest-api/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -8,7 +8,7 @@ const UserModel = require('../../../adapters/localdb/models/users')
 // User library for business logic.
 const UserLib = require('../../../lib/users')
 
-const wlogger = require('../../../lib/wlogger')
+const wlogger = require('../../../adapters/wlogger')
 
 let _this
 
diff --git a/src/lib/contact.js b/src/lib/contact.js
index 0c69393..636cc0b 100644
--- a/src/lib/contact.js
+++ b/src/lib/contact.js
@@ -7,9 +7,9 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 
 const config = require('../../config')
 
-const NodeMailer = require('../lib/nodemailer')
+const NodeMailer = require('../adapters/nodemailer')
 const nodemailer = new NodeMailer()
-const wlogger = require('./wlogger')
+const wlogger = require('../adapters/wlogger')
 
 let _this
 
diff --git a/src/lib/users.js b/src/lib/users.js
index c195841..0024ed8 100644
--- a/src/lib/users.js
+++ b/src/lib/users.js
@@ -4,7 +4,7 @@
 */
 
 const UserModel = require('../adapters/localdb/models/users')
-const wlogger = require('./wlogger')
+const wlogger = require('../adapters/wlogger')
 
 class UserLib {
   constructor (configObj) {
diff --git a/test/unit/biz-logic/a03-nodemailer.lib-unit.js b/test/unit/biz-logic/a03-nodemailer.lib-unit.js
index 79c2fce..11f29ac 100644
--- a/test/unit/biz-logic/a03-nodemailer.lib-unit.js
+++ b/test/unit/biz-logic/a03-nodemailer.lib-unit.js
@@ -6,7 +6,7 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const NodeMailer = require('../../../src/lib/nodemailer')
+const NodeMailer = require('../../../src/adapters/nodemailer')
 
 let sandbox
 let uut

From 89bc296381a3c87dc5e98e711ae2715888a1f7a0 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 08:40:00 -0700
Subject: [PATCH 18/43] Added libraries to adapter lib

---
 src/adapters/index.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/adapters/index.js b/src/adapters/index.js
index 106a1cd..52d22fa 100644
--- a/src/adapters/index.js
+++ b/src/adapters/index.js
@@ -8,10 +8,15 @@
 const IPFSAdapter = require('./ipfs')
 const LocalDB = require('./localdb')
 const LogsAPI = require('./logapi')
+const Passport = require('./passport')
+const Nodemailer = require('./nodemailer')
+const wlogger = require('./wlogger')
 
 // Instantiate adapter libraries.
 const ipfs = new IPFSAdapter()
 const localdb = new LocalDB()
 const logapi = new LogsAPI()
+const passport = new Passport()
+const nodemailer = new Nodemailer()
 
-module.exports = { ipfs, localdb, logapi }
+module.exports = { ipfs, localdb, logapi, passport, nodemailer, wlogger }

From 67c5f553b6b3962086d2aa54a22bc58562d835a7 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 16:55:08 -0700
Subject: [PATCH 19/43] moved json-files to adapters directory

---
 src/adapters/index.js                          | 12 +++++++++++-
 src/{lib/utils => adapters}/json-files.js      |  0
 src/lib/admin.js                               |  2 +-
 test/unit/biz-logic/a07-json-files.lib-unit.js |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)
 rename src/{lib/utils => adapters}/json-files.js (100%)

diff --git a/src/adapters/index.js b/src/adapters/index.js
index 52d22fa..86bd3ce 100644
--- a/src/adapters/index.js
+++ b/src/adapters/index.js
@@ -11,6 +11,7 @@ const LogsAPI = require('./logapi')
 const Passport = require('./passport')
 const Nodemailer = require('./nodemailer')
 const wlogger = require('./wlogger')
+const JSONFiles = require('./json-files')
 
 // Instantiate adapter libraries.
 const ipfs = new IPFSAdapter()
@@ -18,5 +19,14 @@ const localdb = new LocalDB()
 const logapi = new LogsAPI()
 const passport = new Passport()
 const nodemailer = new Nodemailer()
+const jsonFiles = new JSONFiles()
 
-module.exports = { ipfs, localdb, logapi, passport, nodemailer, wlogger }
+module.exports = {
+  ipfs,
+  localdb,
+  logapi,
+  passport,
+  nodemailer,
+  wlogger,
+  jsonFiles
+}
diff --git a/src/lib/utils/json-files.js b/src/adapters/json-files.js
similarity index 100%
rename from src/lib/utils/json-files.js
rename to src/adapters/json-files.js
diff --git a/src/lib/admin.js b/src/lib/admin.js
index 18306e1..4634da4 100644
--- a/src/lib/admin.js
+++ b/src/lib/admin.js
@@ -14,7 +14,7 @@ const axios = require('axios').default
 const mongoose = require('mongoose')
 const User = require('../adapters/localdb/models/users')
 const config = require('../../config')
-const JsonFiles = require('./utils/json-files')
+const JsonFiles = require('../adapters/json-files')
 const jsonFiles = new JsonFiles()
 
 const JSON_FILE = `system-user-${config.env}.json`
diff --git a/test/unit/biz-logic/a07-json-files.lib-unit.js b/test/unit/biz-logic/a07-json-files.lib-unit.js
index a62a485..bc3985c 100644
--- a/test/unit/biz-logic/a07-json-files.lib-unit.js
+++ b/test/unit/biz-logic/a07-json-files.lib-unit.js
@@ -5,7 +5,7 @@ const sinon = require('sinon')
 const util = require('util')
 util.inspect.defaultOptions = { depth: 1 }
 
-const JsonFiles = require('../../../src/lib/utils/json-files')
+const JsonFiles = require('../../../src/adapters/json-files')
 
 const JSON_FILE = 'test-json-file.json'
 const JSON_PATH = `${__dirname.toString()}/${JSON_FILE}`

From 36791231cc4a8d7275608df919947b317467fd92 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 17:04:19 -0700
Subject: [PATCH 20/43] Moved auth library to adapters dir

---
 bin/server.js                            | 2 +-
 src/{lib => adapters}/admin.js           | 4 ++++
 src/adapters/localdb/models/users.js     | 3 +++
 test/e2e/automated/a01-auth.rest-e2e.js  | 2 +-
 test/e2e/automated/a09-admin.rest-e2e.js | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)
 rename src/{lib => adapters}/admin.js (96%)

diff --git a/bin/server.js b/bin/server.js
index 90324a1..86f7ce8 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -13,7 +13,7 @@ const cors = require('kcors')
 // Local libraries
 const config = require('../config') // this first.
 // const IPFSLib = require('../src/lib/ipfs')
-const AdminLib = require('../src/lib/admin')
+const AdminLib = require('../src/adapters/admin')
 const adminLib = new AdminLib()
 // const JSONRPC = require('../src/rpc')
 // const rpc = new JSONRPC()
diff --git a/src/lib/admin.js b/src/adapters/admin.js
similarity index 96%
rename from src/lib/admin.js
rename to src/adapters/admin.js
index 4634da4..763c665 100644
--- a/src/lib/admin.js
+++ b/src/adapters/admin.js
@@ -7,6 +7,10 @@
   and JWT token for the admin account is written to a JSON file, for easy
   retrieval by other apps running on the server that may need admin privledges
   to access private APIs.
+
+  This library is really more of an Adapter to the internal systems default
+  admin user. It's not really a central Entity, which is why this library lives
+  in the Adapter directory.
 */
 
 'use strict'
diff --git a/src/adapters/localdb/models/users.js b/src/adapters/localdb/models/users.js
index 918d294..b8e0b0f 100644
--- a/src/adapters/localdb/models/users.js
+++ b/src/adapters/localdb/models/users.js
@@ -22,6 +22,7 @@ const User = new mongoose.Schema({
   }
 })
 
+// Before saving, convert the password to a hash.
 User.pre('save', function preSave (next) {
   const user = this
 
@@ -51,6 +52,7 @@ User.pre('save', function preSave (next) {
     .catch(err => next(err))
 })
 
+// Validate the password by comparing to the saved hash.
 User.methods.validatePassword = function validatePassword (password) {
   const user = this
 
@@ -65,6 +67,7 @@ User.methods.validatePassword = function validatePassword (password) {
   })
 }
 
+// Generate a JWT token.
 User.methods.generateToken = function generateToken () {
   const user = this
 
diff --git a/test/e2e/automated/a01-auth.rest-e2e.js b/test/e2e/automated/a01-auth.rest-e2e.js
index 52099ee..e4f367b 100644
--- a/test/e2e/automated/a01-auth.rest-e2e.js
+++ b/test/e2e/automated/a01-auth.rest-e2e.js
@@ -12,7 +12,7 @@ const axios = require('axios').default
 const config = require('../../../config')
 const app = require('../../../bin/server')
 const testUtils = require('../../utils/test-utils')
-const AdminLib = require('../../../src/lib/admin')
+const AdminLib = require('../../../src/adapters/admin')
 const adminLib = new AdminLib()
 
 // const request = supertest.agent(app.listen())
diff --git a/test/e2e/automated/a09-admin.rest-e2e.js b/test/e2e/automated/a09-admin.rest-e2e.js
index 4391f2a..cf94d2f 100644
--- a/test/e2e/automated/a09-admin.rest-e2e.js
+++ b/test/e2e/automated/a09-admin.rest-e2e.js
@@ -1,6 +1,6 @@
 const assert = require('chai').assert
 
-const Admin = require('../../../src/lib/admin')
+const Admin = require('../../../src/adapters/admin')
 
 const sinon = require('sinon')
 

From c5e0a8a95b9fa4f16b0bec28749bca3378d9d94f Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 17:08:30 -0700
Subject: [PATCH 21/43] Moved contact lib to adapters dir

---
 src/{lib => adapters}/contact.js               |  0
 src/controllers/json-rpc/rate-limit.js         |  8 ++++----
 src/controllers/rest-api/contact/controller.js |  2 +-
 test/unit/biz-logic/a04-contact.lib-unit.js    | 16 ++++++++++++----
 4 files changed, 17 insertions(+), 9 deletions(-)
 rename src/{lib => adapters}/contact.js (100%)

diff --git a/src/lib/contact.js b/src/adapters/contact.js
similarity index 100%
rename from src/lib/contact.js
rename to src/adapters/contact.js
diff --git a/src/controllers/json-rpc/rate-limit.js b/src/controllers/json-rpc/rate-limit.js
index bc03c69..afa61a2 100644
--- a/src/controllers/json-rpc/rate-limit.js
+++ b/src/controllers/json-rpc/rate-limit.js
@@ -30,10 +30,10 @@ class RateLimit {
       set: () => {}
     }
 
-    console.log(
-      `this.defaultOptions: ${JSON.stringify(this.defaultOptions, null, 2)}`
-    )
-    console.log(`options: ${JSON.stringify(options, null, 2)}`)
+    // console.log(
+    //   `this.defaultOptions: ${JSON.stringify(this.defaultOptions, null, 2)}`
+    // )
+    // console.log(`options: ${JSON.stringify(options, null, 2)}`)
 
     // Set rate limit settings. Default values are overwritten if user passes
     // in an options object.
diff --git a/src/controllers/rest-api/contact/controller.js b/src/controllers/rest-api/contact/controller.js
index b5b94b5..db0e3ac 100644
--- a/src/controllers/rest-api/contact/controller.js
+++ b/src/controllers/rest-api/contact/controller.js
@@ -5,7 +5,7 @@
 /* eslint-disable no-useless-escape */
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 
-const ContactLib = require('../../../lib/contact')
+const ContactLib = require('../../../adapters/contact')
 const contactLib = new ContactLib()
 
 let _this
diff --git a/test/unit/biz-logic/a04-contact.lib-unit.js b/test/unit/biz-logic/a04-contact.lib-unit.js
index 56890ac..078e44b 100644
--- a/test/unit/biz-logic/a04-contact.lib-unit.js
+++ b/test/unit/biz-logic/a04-contact.lib-unit.js
@@ -1,7 +1,7 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const ContactLib = require('../../../src/lib/contact')
+const ContactLib = require('../../../src/adapters/contact')
 let uut
 let sandbox
 
@@ -51,7 +51,10 @@ describe('Contact', () => {
         await uut.sendEmail(data)
         assert(false, 'Unexpected result')
       } catch (err) {
-        assert.include(err.message, "Property 'emailList' must be a array of emails!")
+        assert.include(
+          err.message,
+          "Property 'emailList' must be a array of emails!"
+        )
       }
     })
 
@@ -67,7 +70,10 @@ describe('Contact', () => {
         await uut.sendEmail(data)
         assert(false, 'Unexpected result')
       } catch (err) {
-        assert.include(err.message, "Property 'emailList' must be a array of emails!")
+        assert.include(
+          err.message,
+          "Property 'emailList' must be a array of emails!"
+        )
       }
     })
 
@@ -89,7 +95,9 @@ describe('Contact', () => {
     it('should catch and throw nodemailer lib error', async () => {
       try {
         // Force an error with the database.
-        sandbox.stub(uut.nodemailer, 'sendEmail').throws(new Error('test error'))
+        sandbox
+          .stub(uut.nodemailer, 'sendEmail')
+          .throws(new Error('test error'))
 
         const data = {
           formMessage: 'test msg',

From 6e08ddba7f397ec3e44611ed34b3e144acf3df51 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 17:15:27 -0700
Subject: [PATCH 22/43] moved auth lib into validators lib

---
 .../rest-api/middleware/validators.js         | 19 ++++++++++++++++--
 src/lib/auth.js                               | 20 -------------------
 2 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 src/lib/auth.js

diff --git a/src/controllers/rest-api/middleware/validators.js b/src/controllers/rest-api/middleware/validators.js
index 47aa3a3..37bf54a 100644
--- a/src/controllers/rest-api/middleware/validators.js
+++ b/src/controllers/rest-api/middleware/validators.js
@@ -4,7 +4,6 @@
 
 const User = require('../../../adapters/localdb/models/users')
 const config = require('../../../../config')
-const getToken = require('../../../lib/auth')
 const jwt = require('jsonwebtoken')
 const wlogger = require('../../../adapters/wlogger')
 
@@ -13,7 +12,6 @@ let _this
 class Validators {
   constructor () {
     this.User = User
-    this.getToken = getToken
     this.jwt = jwt
     this.config = config
 
@@ -149,6 +147,23 @@ class Validators {
       ctx.throw(401, error.message)
     }
   }
+
+  getToken (ctx) {
+    const header = ctx.request.header.authorization
+    if (!header) {
+      return null
+    }
+    const parts = header.split(' ')
+    if (parts.length !== 2) {
+      return null
+    }
+    const scheme = parts[0]
+    const token = parts[1]
+    if (/^Bearer$/i.test(scheme)) {
+      return token
+    }
+    return null
+  }
 }
 
 module.exports = Validators
diff --git a/src/lib/auth.js b/src/lib/auth.js
deleted file mode 100644
index 246fdab..0000000
--- a/src/lib/auth.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-  Retrieves the JWT token from the header of the API request.
-*/
-
-module.exports = function getToken (ctx) {
-  const header = ctx.request.header.authorization
-  if (!header) {
-    return null
-  }
-  const parts = header.split(' ')
-  if (parts.length !== 2) {
-    return null
-  }
-  const scheme = parts[0]
-  const token = parts[1]
-  if (/^Bearer$/i.test(scheme)) {
-    return token
-  }
-  return null
-}

From d0cb10309829a37c092b62f22118110fd255123b Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 17:46:46 -0700
Subject: [PATCH 23/43] Moved user lib to use-cases dir

---
 src/controllers/json-rpc/auth/index.js       |  2 +-
 src/controllers/json-rpc/users/index.js      |  2 +-
 src/controllers/rest-api/users/controller.js |  2 +-
 src/entities/user.js                         | 24 ++++++++++++++++++++
 src/{lib/users.js => use-cases/user.js}      |  0
 test/unit/biz-logic/a02-users.lib-unit.js    | 13 ++++-------
 test/unit/json-rpc/a11-auth.unit.js          |  2 +-
 test/unit/json-rpc/a12-validators.unit.js    |  2 +-
 8 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 src/entities/user.js
 rename src/{lib/users.js => use-cases/user.js} (100%)

diff --git a/src/controllers/json-rpc/auth/index.js b/src/controllers/json-rpc/auth/index.js
index 1ba6d6e..9221742 100644
--- a/src/controllers/json-rpc/auth/index.js
+++ b/src/controllers/json-rpc/auth/index.js
@@ -7,7 +7,7 @@ const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
 // const AuthLib = require('../../lib/auth')
-const UserLib = require('../../../lib/users')
+const UserLib = require('../../../use-cases/user')
 const wlogger = require('../../../adapters/wlogger')
 const RateLimit = require('../rate-limit')
 
diff --git a/src/controllers/json-rpc/users/index.js b/src/controllers/json-rpc/users/index.js
index 72545d8..6fdd7cc 100644
--- a/src/controllers/json-rpc/users/index.js
+++ b/src/controllers/json-rpc/users/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
-const UserLib = require('../../../lib/users')
+const UserLib = require('../../../use-cases/user')
 const Validators = require('../validators')
 const RateLimit = require('../rate-limit')
 
diff --git a/src/controllers/rest-api/users/controller.js b/src/controllers/rest-api/users/controller.js
index f2e981b..d6c054c 100644
--- a/src/controllers/rest-api/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -6,7 +6,7 @@
 const UserModel = require('../../../adapters/localdb/models/users')
 
 // User library for business logic.
-const UserLib = require('../../../lib/users')
+const UserLib = require('../../../use-cases/user')
 
 const wlogger = require('../../../adapters/wlogger')
 
diff --git a/src/entities/user.js b/src/entities/user.js
new file mode 100644
index 0000000..86114ea
--- /dev/null
+++ b/src/entities/user.js
@@ -0,0 +1,24 @@
+/*
+  User Entity
+*/
+
+class User {
+  validate ({ name, email, password } = {}) {
+    // Input Validation
+    if (!email || typeof email !== 'string') {
+      throw new Error("Property 'email' must be a string!")
+    }
+    if (!password || typeof password !== 'string') {
+      throw new Error("Property 'password' must be a string!")
+    }
+    if (!name || typeof name !== 'string') {
+      throw new Error("Property 'name' must be a string!")
+    }
+
+    const userData = { name, email, password }
+
+    return userData
+  }
+}
+
+module.exports = User
diff --git a/src/lib/users.js b/src/use-cases/user.js
similarity index 100%
rename from src/lib/users.js
rename to src/use-cases/user.js
diff --git a/test/unit/biz-logic/a02-users.lib-unit.js b/test/unit/biz-logic/a02-users.lib-unit.js
index 507b171..f1b9ef8 100644
--- a/test/unit/biz-logic/a02-users.lib-unit.js
+++ b/test/unit/biz-logic/a02-users.lib-unit.js
@@ -14,7 +14,7 @@ const config = require('../../../config')
 const testUtils = require('../../utils/test-utils')
 
 // Unit under test (uut)
-const UserLib = require('../../../src/lib/users')
+const UserLib = require('../../../src/use-cases/user')
 
 describe('#users', () => {
   let uut
@@ -26,13 +26,10 @@ describe('#users', () => {
     console.log(`Connecting to database: ${config.database}`)
     mongoose.Promise = global.Promise
     mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(
-      config.database,
-      {
-        useUnifiedTopology: true,
-        useNewUrlParser: true
-      }
-    )
+    await mongoose.connect(config.database, {
+      useUnifiedTopology: true,
+      useNewUrlParser: true
+    })
 
     // Delete all previous users in the database.
     await testUtils.deleteAllUsers()
diff --git a/test/unit/json-rpc/a11-auth.unit.js b/test/unit/json-rpc/a11-auth.unit.js
index 078e2dd..b99e6ef 100644
--- a/test/unit/json-rpc/a11-auth.unit.js
+++ b/test/unit/json-rpc/a11-auth.unit.js
@@ -16,7 +16,7 @@ process.env.SVC_ENV = 'test'
 const config = require('../../../config')
 const AuthRPC = require('../../../src/controllers/json-rpc/auth')
 const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
-const UserLib = require('../../../src/lib/users')
+const UserLib = require('../../../src/use-cases/user')
 const userLib = new UserLib()
 
 describe('#AuthRPC', () => {
diff --git a/test/unit/json-rpc/a12-validators.unit.js b/test/unit/json-rpc/a12-validators.unit.js
index 45c956a..25b1138 100644
--- a/test/unit/json-rpc/a12-validators.unit.js
+++ b/test/unit/json-rpc/a12-validators.unit.js
@@ -17,7 +17,7 @@ process.env.SVC_ENV = 'test'
 // Local libraries
 const config = require('../../../config')
 const Validators = require('../../../src/controllers/json-rpc/validators')
-const UserLib = require('../../../src/lib/users')
+const UserLib = require('../../../src/use-cases/user')
 const userLib = new UserLib()
 
 describe('#validators', () => {

From 51d4da81518acc82150840e286cad782ecf371ae Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 17:50:13 -0700
Subject: [PATCH 24/43] Commenting out noise in tests

---
 src/controllers/json-rpc/rate-limit.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/controllers/json-rpc/rate-limit.js b/src/controllers/json-rpc/rate-limit.js
index afa61a2..3f284d3 100644
--- a/src/controllers/json-rpc/rate-limit.js
+++ b/src/controllers/json-rpc/rate-limit.js
@@ -38,9 +38,9 @@ class RateLimit {
     // Set rate limit settings. Default values are overwritten if user passes
     // in an options object.
     this.rateLimitOptions = Object.assign({}, this.defaultOptions, options)
-    console.log(
-      `this.rateLimitOptions: ${JSON.stringify(this.rateLimitOptions, null, 2)}`
-    )
+    // console.log(
+    //   `this.rateLimitOptions: ${JSON.stringify(this.rateLimitOptions, null, 2)}`
+    // )
     this.rateLimit = this.RateLimitLib.middleware(this.rateLimitOptions)
   }
 

From bf357443aa9561ff959a82567d455203a9337abe Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sat, 10 Jul 2021 09:04:03 -0700
Subject: [PATCH 25/43] Added unit tests for User Entity

---
 src/controllers/json-rpc/auth/index.js       | 20 +++++-
 src/controllers/json-rpc/index.js            | 10 +--
 src/controllers/json-rpc/users/index.js      | 20 +++++-
 src/controllers/rest-api/auth/controller.js  | 16 ++++-
 src/controllers/rest-api/auth/index.js       | 16 ++++-
 src/controllers/rest-api/auth/router.js      | 16 ++++-
 src/controllers/rest-api/index.js            |  2 +
 src/controllers/rest-api/users/controller.js | 34 +++++++---
 src/controllers/rest-api/users/index.js      | 16 ++++-
 src/controllers/rest-api/users/router.js     | 20 +++++-
 src/use-cases/index.js                       |  5 ++
 src/use-cases/user.js                        | 16 +++--
 test/unit/entities/user.entity.unit.js       | 69 ++++++++++++++++++++
 test/unit/json-rpc/a11-auth.unit.js          | 28 ++++----
 14 files changed, 246 insertions(+), 42 deletions(-)
 create mode 100644 test/unit/entities/user.entity.unit.js

diff --git a/src/controllers/json-rpc/auth/index.js b/src/controllers/json-rpc/auth/index.js
index 9221742..5d8dc95 100644
--- a/src/controllers/json-rpc/auth/index.js
+++ b/src/controllers/json-rpc/auth/index.js
@@ -7,16 +7,30 @@ const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
 // const AuthLib = require('../../lib/auth')
-const UserLib = require('../../../use-cases/user')
+// const UserLib = require('../../../use-cases/user')
 const wlogger = require('../../../adapters/wlogger')
 const RateLimit = require('../rate-limit')
 
 class AuthRPC {
-  constructor (localConfig) {
+  constructor (localConfig = {}) {
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating Auth JSON RPC Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating Auth JSON RPC Controller.'
+      )
+    }
+
     // Encapsulate dependencies
     // this.authLib = new AuthLib()
     this.jsonrpc = jsonrpc
-    this.userLib = new UserLib()
+    this.userLib = this.useCases.user
     this.rateLimit = new RateLimit()
   }
 
diff --git a/src/controllers/json-rpc/index.js b/src/controllers/json-rpc/index.js
index b56c04d..a85deb7 100644
--- a/src/controllers/json-rpc/index.js
+++ b/src/controllers/json-rpc/index.js
@@ -14,26 +14,26 @@ const AboutController = require('./about')
 let _this
 
 class JSONRPC {
-  constructor (localConfig) {
+  constructor (localConfig = {}) {
     // Dependency Injection.
     this.adapters = localConfig.adapters
     if (!this.adapters) {
       throw new Error(
-        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+        'Instance of Adapters library required when instantiating JSON RPC Controllers.'
       )
     }
     this.useCases = localConfig.useCases
     if (!this.useCases) {
       throw new Error(
-        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+        'Instance of Use Cases library required when instantiating JSON RPC Controllers.'
       )
     }
 
     // Encapsulate dependencies
     this.ipfsCoord = this.adapters.ipfs.ipfsCoordAdapter.ipfsCoord
     this.jsonrpc = jsonrpc
-    this.userController = new UserController()
-    this.authController = new AuthController()
+    this.userController = new UserController(localConfig)
+    this.authController = new AuthController(localConfig)
     this.aboutController = new AboutController()
 
     _this = this
diff --git a/src/controllers/json-rpc/users/index.js b/src/controllers/json-rpc/users/index.js
index 6fdd7cc..ae56329 100644
--- a/src/controllers/json-rpc/users/index.js
+++ b/src/controllers/json-rpc/users/index.js
@@ -6,14 +6,28 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
-const UserLib = require('../../../use-cases/user')
+// const UserLib = require('../../../use-cases/user')
 const Validators = require('../validators')
 const RateLimit = require('../rate-limit')
 
 class UserRPC {
-  constructor (localConfig) {
+  constructor (localConfig = {}) {
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating User JSON RPC Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating User JSON RPC Controller.'
+      )
+    }
+
     // Encapsulate dependencies
-    this.userLib = new UserLib()
+    this.userLib = this.useCases.user
     this.jsonrpc = jsonrpc
     this.validators = new Validators()
     this.rateLimit = new RateLimit()
diff --git a/src/controllers/rest-api/auth/controller.js b/src/controllers/rest-api/auth/controller.js
index a799d54..5c5f140 100644
--- a/src/controllers/rest-api/auth/controller.js
+++ b/src/controllers/rest-api/auth/controller.js
@@ -4,7 +4,21 @@ const passport = new Passport()
 let _this
 
 class AuthRESTController {
-  constructor () {
+  constructor (localConfig = {}) {
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+      )
+    }
+
     _this = this
     this.passport = passport
   }
diff --git a/src/controllers/rest-api/auth/index.js b/src/controllers/rest-api/auth/index.js
index 20c769c..0ea355a 100644
--- a/src/controllers/rest-api/auth/index.js
+++ b/src/controllers/rest-api/auth/index.js
@@ -6,7 +6,21 @@ const AuthRESTRouter = require('./router')
 
 class AuthRESTController {
   constructor (localConfig = {}) {
-    this.authRESTRouter = new AuthRESTRouter()
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+      )
+    }
+
+    this.authRESTRouter = new AuthRESTRouter(localConfig)
   }
 
   attach (app) {
diff --git a/src/controllers/rest-api/auth/router.js b/src/controllers/rest-api/auth/router.js
index c826321..6320ebd 100644
--- a/src/controllers/rest-api/auth/router.js
+++ b/src/controllers/rest-api/auth/router.js
@@ -10,8 +10,22 @@ const AuthRESTController = require('./controller')
 
 class AuthRESTRouter {
   constructor (localConfig = {}) {
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+      )
+    }
+
     // Encapsulate dependencies.
-    this.authRESTController = new AuthRESTController()
+    this.authRESTController = new AuthRESTController(localConfig)
 
     // Instantiate the router and set the base route.
     const baseUrl = '/auth'
diff --git a/src/controllers/rest-api/index.js b/src/controllers/rest-api/index.js
index 49ca36a..505d091 100644
--- a/src/controllers/rest-api/index.js
+++ b/src/controllers/rest-api/index.js
@@ -27,6 +27,8 @@ class RESTControllers {
         'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
       )
     }
+
+    // console.log('Controllers localConfig: ', localConfig)
   }
 
   attachRESTControllers (app) {
diff --git a/src/controllers/rest-api/users/controller.js b/src/controllers/rest-api/users/controller.js
index d6c054c..597b12b 100644
--- a/src/controllers/rest-api/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -3,20 +3,34 @@
 */
 
 // User database model.
-const UserModel = require('../../../adapters/localdb/models/users')
+// const UserModel = require('../../../adapters/localdb/models/users')
 
 // User library for business logic.
-const UserLib = require('../../../use-cases/user')
+// const UserLib = require('../../../use-cases/user')
 
 const wlogger = require('../../../adapters/wlogger')
 
 let _this
 
 class UserRESTControllerLib {
-  constructor () {
+  constructor (localConfig = {}) {
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating /users REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating /users REST Controller.'
+      )
+    }
+
     // Encapsulate dependencies
-    this.UserModel = UserModel
-    this.userLib = new UserLib()
+    this.UserModel = this.adapters.localdb.Users
+    // this.userUseCases = this.useCases.user
 
     _this = this
   }
@@ -66,7 +80,7 @@ class UserRESTControllerLib {
     try {
       const userObj = ctx.request.body.user
 
-      const { userData, token } = await _this.userLib.createUser(userObj)
+      const { userData, token } = await _this.useCases.user.createUser(userObj)
       // console.log('userData: ', userData)
       // console.log('token: ', token)
 
@@ -112,7 +126,7 @@ class UserRESTControllerLib {
    */
   async getUsers (ctx) {
     try {
-      const users = await _this.userLib.getAllUsers()
+      const users = await _this.useCases.user.getAllUsers()
 
       ctx.body = { users }
     } catch (err) {
@@ -151,7 +165,7 @@ class UserRESTControllerLib {
    */
   async getUser (ctx, next) {
     try {
-      const user = await _this.userLib.getUser(ctx.params)
+      const user = await _this.useCases.user.getUser(ctx.params)
 
       ctx.body = {
         user
@@ -212,7 +226,7 @@ class UserRESTControllerLib {
       const existingUser = ctx.body.user
       const newData = ctx.request.body.user
 
-      const user = await _this.userLib.updateUser(existingUser, newData)
+      const user = await _this.useCases.user.updateUser(existingUser, newData)
 
       ctx.body = {
         user
@@ -246,7 +260,7 @@ class UserRESTControllerLib {
       const user = ctx.body.user
 
       // await user.remove()
-      await _this.userLib.deleteUser(user)
+      await _this.useCases.user.deleteUser(user)
 
       ctx.status = 200
       ctx.body = {
diff --git a/src/controllers/rest-api/users/index.js b/src/controllers/rest-api/users/index.js
index dc94afc..302b701 100644
--- a/src/controllers/rest-api/users/index.js
+++ b/src/controllers/rest-api/users/index.js
@@ -6,7 +6,21 @@ const UserRESTRouter = require('./router')
 
 class UserRESTController {
   constructor (localConfig = {}) {
-    this.userRESTRouter = new UserRESTRouter()
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+      )
+    }
+
+    this.userRESTRouter = new UserRESTRouter(localConfig)
   }
 
   attach (app) {
diff --git a/src/controllers/rest-api/users/router.js b/src/controllers/rest-api/users/router.js
index 58d4df0..a57086a 100644
--- a/src/controllers/rest-api/users/router.js
+++ b/src/controllers/rest-api/users/router.js
@@ -13,8 +13,26 @@ let _this
 
 class UserRESTRouter {
   constructor (localConfig = {}) {
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating /users REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating /users REST Controller.'
+      )
+    }
+    const dependencies = {
+      adapters: this.adapters,
+      useCases: this.useCases
+    }
+
     // Encapsulate dependencies.
-    this.userRESTController = new UserRESTControllerLib()
+    this.userRESTController = new UserRESTControllerLib(dependencies)
     this.validators = new Validators()
 
     // Instantiate the router and set the base route.
diff --git a/src/use-cases/index.js b/src/use-cases/index.js
index 10441ae..015368f 100644
--- a/src/use-cases/index.js
+++ b/src/use-cases/index.js
@@ -4,6 +4,8 @@
   https://troutsblog.com/blog/clean-architecture
 */
 
+const UserUseCases = require('./user')
+
 class UseCases {
   constructor (localConfig = {}) {
     this.adapters = localConfig.adapters
@@ -12,6 +14,9 @@ class UseCases {
         'Instance of adapters must be passed in when instantiating Use Cases library.'
       )
     }
+
+    // console.log('use-cases/index.js localConfig: ', localConfig)
+    this.user = new UserUseCases(localConfig)
   }
 }
 
diff --git a/src/use-cases/user.js b/src/use-cases/user.js
index 0024ed8..1c18917 100644
--- a/src/use-cases/user.js
+++ b/src/use-cases/user.js
@@ -3,13 +3,21 @@
   functions are called by the /user REST API endpoints.
 */
 
-const UserModel = require('../adapters/localdb/models/users')
+// const UserModel = require('../adapters/localdb/models/users')
 const wlogger = require('../adapters/wlogger')
 
 class UserLib {
-  constructor (configObj) {
+  constructor (localConfig = {}) {
+    // console.log('User localConfig: ', localConfig)
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of adapters must be passed in when instantiating User Use Cases library.'
+      )
+    }
+
     // Encapsulate dependencies
-    this.UserModel = UserModel
+    this.UserModel = this.adapters.localdb.Users
   }
 
   // Create a new user model and add it to the Mongo database.
@@ -160,7 +168,7 @@ class UserLib {
       // console.log('login: ', login)
       // console.log('passwd: ', passwd)
 
-      const user = await UserModel.findOne({ email: login })
+      const user = await this.UserModel.findOne({ email: login })
       if (!user) {
         throw new Error('User not found')
       }
diff --git a/test/unit/entities/user.entity.unit.js b/test/unit/entities/user.entity.unit.js
new file mode 100644
index 0000000..a2b80c3
--- /dev/null
+++ b/test/unit/entities/user.entity.unit.js
@@ -0,0 +1,69 @@
+/*
+  Unit tests for the User entity library.
+*/
+
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+const User = require('../../../src/entities/user')
+
+let sandbox
+let uut
+
+describe('#User-Entity', () => {
+  before(async () => {})
+
+  beforeEach(() => {
+    uut = new User()
+
+    sandbox = sinon.createSandbox()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#validate', () => {
+    it('should throw an error if email is not provided', () => {
+      try {
+        uut.validate()
+      } catch (err) {
+        assert.include(err.message, "Property 'email' must be a string!")
+      }
+    })
+
+    it('should throw an error if password is not provided', () => {
+      try {
+        uut.validate({ email: 'test@test.com' })
+      } catch (err) {
+        assert.include(err.message, "Property 'password' must be a string!")
+      }
+    })
+
+    it('should throw an error if name is not provided', () => {
+      try {
+        uut.validate({ email: 'test@test.com', password: 'test' })
+      } catch (err) {
+        assert.include(err.message, "Property 'name' must be a string!")
+      }
+    })
+
+    it('should return a User object', () => {
+      const inputData = {
+        email: 'test@test.com',
+        password: 'test',
+        name: 'test'
+      }
+
+      const entry = uut.validate(inputData)
+      // console.log('entry: ', entry)
+
+      assert.property(entry, 'email')
+      assert.equal(entry.email, inputData.email)
+
+      assert.property(entry, 'password')
+      assert.equal(entry.password, inputData.password)
+
+      assert.property(entry, 'name')
+      assert.equal(entry.name, inputData.name)
+    })
+  })
+})
diff --git a/test/unit/json-rpc/a11-auth.unit.js b/test/unit/json-rpc/a11-auth.unit.js
index b99e6ef..c062edc 100644
--- a/test/unit/json-rpc/a11-auth.unit.js
+++ b/test/unit/json-rpc/a11-auth.unit.js
@@ -1,5 +1,5 @@
 /*
-  Unit tests for the rpc/auth/index.js file.
+  Unit tests for the json-rpc/auth/index.js file.
 */
 
 // Public npm libraries
@@ -16,13 +16,15 @@ process.env.SVC_ENV = 'test'
 const config = require('../../../config')
 const AuthRPC = require('../../../src/controllers/json-rpc/auth')
 const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
-const UserLib = require('../../../src/use-cases/user')
-const userLib = new UserLib()
+// const UserLib = require('../../../src/use-cases/user')
+// const userLib = new UserLib()
+const adapters = require('../mocks/adapters')
+const UseCasesMock = require('../mocks/use-cases')
 
 describe('#AuthRPC', () => {
   let uut
   let sandbox
-  let testUser
+  // let testUser
 
   before(async () => {
     // Connect to the Mongo Database.
@@ -35,17 +37,19 @@ describe('#AuthRPC', () => {
     })
 
     // Create a test user.
-    testUser = await userLib.createUser({
-      email: 'test543@test.com',
-      name: 'tester543',
-      password: 'password'
-    })
+    // testUser = await userLib.createUser({
+    //   email: 'test543@test.com',
+    //   name: 'tester543',
+    //   password: 'password'
+    // })
   })
 
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
-    uut = new AuthRPC()
+    const useCases = new UseCasesMock()
+
+    uut = new AuthRPC({ adapters, useCases })
     uut.rateLimit = new RateLimit({ max: 100 })
   })
 
@@ -53,8 +57,8 @@ describe('#AuthRPC', () => {
 
   after(async () => {
     // Delete the test user.
-    testUser = await userLib.getUser({ id: testUser.userData._id })
-    await userLib.deleteUser(testUser)
+    // testUser = await userLib.getUser({ id: testUser.userData._id })
+    // await userLib.deleteUser(testUser)
 
     mongoose.connection.close()
   })

From 2667002b0df3f74a9566f8af7c57118372fdfc47 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sat, 10 Jul 2021 09:57:25 -0700
Subject: [PATCH 26/43] Refactored JSON RPC validation library

---
 src/controllers/json-rpc/users/index.js   |   2 +-
 src/controllers/json-rpc/validators.js    |  16 +++-
 test/unit/json-rpc/a12-validators.unit.js | 112 ++++++++++++----------
 test/unit/mocks/adapters/index.js         |   8 +-
 4 files changed, 84 insertions(+), 54 deletions(-)

diff --git a/src/controllers/json-rpc/users/index.js b/src/controllers/json-rpc/users/index.js
index ae56329..bfadedc 100644
--- a/src/controllers/json-rpc/users/index.js
+++ b/src/controllers/json-rpc/users/index.js
@@ -29,7 +29,7 @@ class UserRPC {
     // Encapsulate dependencies
     this.userLib = this.useCases.user
     this.jsonrpc = jsonrpc
-    this.validators = new Validators()
+    this.validators = new Validators(localConfig)
     this.rateLimit = new RateLimit()
   }
 
diff --git a/src/controllers/json-rpc/validators.js b/src/controllers/json-rpc/validators.js
index 7158dbf..50cd251 100644
--- a/src/controllers/json-rpc/validators.js
+++ b/src/controllers/json-rpc/validators.js
@@ -8,14 +8,22 @@ const jwt = require('jsonwebtoken')
 
 // Local libraries
 const config = require('../../../config')
-const UserModel = require('../../adapters/localdb/models/users')
+// const UserModel = require('../../adapters/localdb/models/users')
 
 class Validators {
-  constructor () {
+  constructor (localConfig = {}) {
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating JSON RPC Validators library.'
+      )
+    }
+
     // Encapsulate dependencies
     this.config = config
-    this.UserModel = UserModel
     this.jwt = jwt
+    this.UserModel = this.adapters.localdb.Users
   }
 
   // Returns if user passes a valid JWT token that resolves to a valid user.
@@ -63,7 +71,7 @@ class Validators {
       if (!user) throw new Error('User not found!')
 
       // If this current user is an admin, then quietly exit.
-      if (user.type === 'admin') return
+      if (user.type === 'admin') return true
 
       // Throw an error if the JWT token does not match the targeted user.
       if (user._id.toString() !== targetUserId) {
diff --git a/test/unit/json-rpc/a12-validators.unit.js b/test/unit/json-rpc/a12-validators.unit.js
index 25b1138..bce6c39 100644
--- a/test/unit/json-rpc/a12-validators.unit.js
+++ b/test/unit/json-rpc/a12-validators.unit.js
@@ -6,7 +6,6 @@
 
 // Public npm libraries
 const jsonrpc = require('jsonrpc-lite')
-const mongoose = require('mongoose')
 const sinon = require('sinon')
 const assert = require('chai').assert
 const { v4: uid } = require('uuid')
@@ -15,49 +14,34 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const config = require('../../../config')
 const Validators = require('../../../src/controllers/json-rpc/validators')
-const UserLib = require('../../../src/use-cases/user')
-const userLib = new UserLib()
+const adapters = require('../mocks/adapters')
 
 describe('#validators', () => {
-  let testUser
   let uut
   let sandbox
 
-  before(async () => {
-    // Connect to the Mongo Database.
-    console.log(`Connecting to database: ${config.database}`)
-    mongoose.Promise = global.Promise
-    mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(config.database, {
-      useUnifiedTopology: true,
-      useNewUrlParser: true
-    })
-
-    // Create a test user.
-    testUser = await userLib.createUser({
-      email: 'test544@test.com',
-      name: 'tester544',
-      password: 'password'
-    })
-    // console.log('testUser: ', testUser)
-  })
-
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
-    uut = new Validators()
+    uut = new Validators({ adapters })
   })
 
   afterEach(() => sandbox.restore())
 
-  after(async () => {
-    // Delete the test user.
-    testUser = await userLib.getUser({ id: testUser.userData._id })
-    await userLib.deleteUser(testUser)
+  describe('#constructor', () => {
+    it('should throw an error if adapters is not passed in.', () => {
+      try {
+        uut = new Validators()
 
-    mongoose.connection.close()
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating JSON RPC Validators library.'
+        )
+      }
+    })
   })
 
   describe('#ensureUser', () => {
@@ -67,18 +51,20 @@ describe('#validators', () => {
       const id = uid()
       const userCall = jsonrpc.request(id, 'users', {
         endpoint: 'getAll',
-        apiToken: testUser.token
+        apiToken: 'fakeJWTToken'
       })
       const jsonStr = JSON.stringify(userCall, null, 2)
       const rpcData = jsonrpc.parse(jsonStr)
 
+      // Mock external dependencies.
+      sandbox.stub(uut.jwt, 'verify').returns(true)
+      sandbox.stub(uut.UserModel, 'findById').resolves(true)
+
       const user = await uut.ensureUser(rpcData)
       // console.log('user: ', user)
 
-      assert.property(user, 'type')
-      assert.property(user, '_id')
-      assert.property(user, 'email')
-      assert.property(user, 'name')
+      // For this test, we return a value of 'true' instead of actual user data.
+      assert.equal(user, true)
     })
 
     it('should throw an error if JWT token is not included', async () => {
@@ -129,13 +115,14 @@ describe('#validators', () => {
       try {
         // Force 'error not found' error
         sandbox.stub(uut.UserModel, 'findById').resolves(null)
+        sandbox.stub(uut.jwt, 'verify').returns(true)
 
         // Generate the parsed data that the main router would pass to this
         // endpoint.
         const id = uid()
         const userCall = jsonrpc.request(id, 'users', {
           endpoint: 'getAll',
-          apiToken: testUser.token
+          apiToken: 'fakeJWTToken'
         })
         const jsonStr = JSON.stringify(userCall, null, 2)
         const rpcData = jsonrpc.parse(jsonStr)
@@ -157,18 +144,21 @@ describe('#validators', () => {
       const id = uid()
       const userCall = jsonrpc.request(id, 'users', {
         endpoint: 'deleteUser',
-        apiToken: testUser.token,
-        userId: testUser.userData._id.toString()
+        apiToken: 'fakeJWTToken',
+        userId: 'abc123'
       })
       const jsonStr = JSON.stringify(userCall, null, 2)
       const rpcData = jsonrpc.parse(jsonStr)
 
-      const user = await uut.ensureTargetUserOrAdmin(rpcData)
+      // Mock external dependencies.
+      sandbox.stub(uut.jwt, 'verify').returns(true)
+      sandbox.stub(uut.UserModel, 'findById').resolves({ _id: 'abc123' })
 
-      assert.property(user, 'type')
-      assert.property(user, '_id')
-      assert.property(user, 'email')
-      assert.property(user, 'name')
+      const user = await uut.ensureTargetUserOrAdmin(rpcData)
+      // console.log('user: ', user)
+
+      // Assert that the mocked data expected is returned.
+      assert.equal(user._id, 'abc123')
     })
 
     it('should throw error if JWT token is not provided', async () => {
@@ -198,7 +188,7 @@ describe('#validators', () => {
         const id = uid()
         const userCall = jsonrpc.request(id, 'users', {
           endpoint: 'deleteUser',
-          apiToken: testUser.token
+          apiToken: 'fakeJWTToken'
         })
         const jsonStr = JSON.stringify(userCall, null, 2)
         const rpcData = jsonrpc.parse(jsonStr)
@@ -223,7 +213,7 @@ describe('#validators', () => {
         const userCall = jsonrpc.request(id, 'users', {
           endpoint: 'deleteUser',
           apiToken: token,
-          userId: testUser.userData._id.toString()
+          userId: 'abc123'
         })
         const jsonStr = JSON.stringify(userCall, null, 2)
         const rpcData = jsonrpc.parse(jsonStr)
@@ -247,12 +237,15 @@ describe('#validators', () => {
         const id = uid()
         const userCall = jsonrpc.request(id, 'users', {
           endpoint: 'deleteUser',
-          apiToken: testUser.token,
-          userId: testUser.userData._id.toString()
+          apiToken: 'fakeJWTToken',
+          userId: 'abc123'
         })
         const jsonStr = JSON.stringify(userCall, null, 2)
         const rpcData = jsonrpc.parse(jsonStr)
 
+        // Mock external dependencies.
+        sandbox.stub(uut.jwt, 'verify').returns(true)
+
         await uut.ensureTargetUserOrAdmin(rpcData)
 
         assert.fail('Unexpected code path')
@@ -262,6 +255,29 @@ describe('#validators', () => {
       }
     })
 
-    // TODO: it should exit quietly if user is an admin.
+    it('should return true if user is an admin', async () => {
+      // Generate the parsed data that the main router would pass to this
+      // endpoint.
+      const id = uid()
+      const userCall = jsonrpc.request(id, 'users', {
+        endpoint: 'deleteUser',
+        apiToken: 'fakeJWTToken',
+        userId: 'abc123'
+      })
+      const jsonStr = JSON.stringify(userCall, null, 2)
+      const rpcData = jsonrpc.parse(jsonStr)
+
+      // Mock external dependencies.
+      sandbox.stub(uut.jwt, 'verify').returns(true)
+      sandbox
+        .stub(uut.UserModel, 'findById')
+        .resolves({ _id: 'abc123', type: 'admin' })
+
+      const user = await uut.ensureTargetUserOrAdmin(rpcData)
+      // console.log('user: ', user)
+
+      // Assert that the mocked data expected is returned.
+      assert.equal(user, true)
+    })
   })
 })
diff --git a/test/unit/mocks/adapters/index.js b/test/unit/mocks/adapters/index.js
index 4e728b1..4bd83dc 100644
--- a/test/unit/mocks/adapters/index.js
+++ b/test/unit/mocks/adapters/index.js
@@ -11,4 +11,10 @@ const ipfs = {
   }
 }
 
-module.exports = { ipfs }
+const localdb = {
+  Users: class Users {
+    static findById () {}
+  }
+}
+
+module.exports = { ipfs, localdb }

From 013f9f9a0928362c2695069c07b81c7062b8b4be Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sat, 10 Jul 2021 17:56:54 -0700
Subject: [PATCH 27/43] fixed tests

---
 package.json                                  |  5 ++
 test/e2e/automated/a02-users.rest-e2e.js      |  8 +-
 test/unit/json-rpc/a11-auth.unit.js           | 14 ++-
 test/unit/json-rpc/a13-users.unit.js          | 90 ++++++++++++-------
 test/unit/mocks/use-cases/index.js            | 37 +++++++-
 test/unit/rest-api/a02-users.rest-unit.js     | 35 +++++---
 .../users.use-case.unit.js}                   |  6 +-
 7 files changed, 139 insertions(+), 56 deletions(-)
 rename test/unit/{biz-logic/a02-users.lib-unit.js => use-cases/users.use-case.unit.js} (98%)

diff --git a/package.json b/package.json
index 951326e..1df7e39 100644
--- a/package.json
+++ b/package.json
@@ -81,5 +81,10 @@
     "hooks": {
       "pre-commit": "npm run lint"
     }
+  },
+  "standard": {
+    "ignore": [
+      "/test/unit/mocks/**/*.js"
+    ]
   }
 }
diff --git a/test/e2e/automated/a02-users.rest-e2e.js b/test/e2e/automated/a02-users.rest-e2e.js
index 8fcbef0..1ccdd46 100644
--- a/test/e2e/automated/a02-users.rest-e2e.js
+++ b/test/e2e/automated/a02-users.rest-e2e.js
@@ -12,6 +12,8 @@ const LOCALHOST = `http://localhost:${config.port}`
 const context = {}
 
 const UserController = require('../../../src/controllers/rest-api/users/controller')
+const adapters = require('../../../src/adapters')
+const UseCases = require('../../../src/use-cases/')
 let uut
 let sandbox
 
@@ -47,7 +49,8 @@ describe('Users', () => {
   })
 
   beforeEach(() => {
-    uut = new UserController()
+    const useCases = new UseCases({ adapters })
+    uut = new UserController({ adapters, useCases })
 
     sandbox = sinon.createSandbox()
   })
@@ -274,7 +277,7 @@ describe('Users', () => {
 
         // Force an error
         sandbox
-          .stub(uut.userLib, 'getAllUsers')
+          .stub(uut.useCases.user, 'getAllUsers')
           .rejects(new Error('test error'))
 
         const options = {
@@ -289,6 +292,7 @@ describe('Users', () => {
 
         assert.fail('Unexpected code path!')
       } catch (err) {
+        console.log(err)
         assert.equal(err.response.status, 422)
         assert.equal(err.response.data, 'test error')
       }
diff --git a/test/unit/json-rpc/a11-auth.unit.js b/test/unit/json-rpc/a11-auth.unit.js
index c062edc..ea4677e 100644
--- a/test/unit/json-rpc/a11-auth.unit.js
+++ b/test/unit/json-rpc/a11-auth.unit.js
@@ -16,15 +16,12 @@ process.env.SVC_ENV = 'test'
 const config = require('../../../config')
 const AuthRPC = require('../../../src/controllers/json-rpc/auth')
 const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
-// const UserLib = require('../../../src/use-cases/user')
-// const userLib = new UserLib()
 const adapters = require('../mocks/adapters')
 const UseCasesMock = require('../mocks/use-cases')
 
 describe('#AuthRPC', () => {
   let uut
   let sandbox
-  // let testUser
 
   before(async () => {
     // Connect to the Mongo Database.
@@ -48,6 +45,10 @@ describe('#AuthRPC', () => {
     sandbox = sinon.createSandbox()
 
     const useCases = new UseCasesMock()
+    // console.log('a11 useCases: ', useCases)
+    // console.log('a11 useCases.user: ', useCases.user)
+    // useCases.helloWorld()
+    // useCases.user.hello2()
 
     uut = new AuthRPC({ adapters, useCases })
     uut.rateLimit = new RateLimit({ max: 100 })
@@ -120,7 +121,7 @@ describe('#AuthRPC', () => {
 
       assert.equal(response.endpoint, 'authUser')
       assert.property(response, 'userId')
-      assert.equal(response.userType, 'user')
+      // assert.equal(response.userType, 'user')
       assert.property(response, 'userName')
       assert.property(response, 'userEmail')
       assert.property(response, 'apiToken')
@@ -141,6 +142,11 @@ describe('#AuthRPC', () => {
       const jsonStr = JSON.stringify(authCall, null, 2)
       const rpcData = jsonrpc.parse(jsonStr)
 
+      // Force an error.
+      sandbox
+        .stub(uut.userLib, 'authUser')
+        .rejects(new Error('Login credential do not match'))
+
       const response = await uut.authUser(rpcData)
       // console.log('response: ', response)
 
diff --git a/test/unit/json-rpc/a13-users.unit.js b/test/unit/json-rpc/a13-users.unit.js
index 3d1c227..2877993 100644
--- a/test/unit/json-rpc/a13-users.unit.js
+++ b/test/unit/json-rpc/a13-users.unit.js
@@ -16,7 +16,9 @@ process.env.SVC_ENV = 'test'
 const config = require('../../../config')
 const UserRPC = require('../../../src/controllers/json-rpc/users')
 const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
-const UserModel = require('../../../src/adapters/localdb/models/users')
+// const UserModel = require('../../../src/adapters/localdb/models/users')
+const adapters = require('../mocks/adapters')
+const UseCasesMock = require('../mocks/use-cases')
 
 describe('#UserRPC', () => {
   let uut
@@ -37,7 +39,9 @@ describe('#UserRPC', () => {
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
-    uut = new UserRPC()
+    const useCases = new UseCasesMock()
+
+    uut = new UserRPC({ adapters, useCases })
     uut.rateLimit = new RateLimit({ max: 100 })
   })
 
@@ -65,11 +69,11 @@ describe('#UserRPC', () => {
       // console.log('result: ', result)
 
       // CreateUser() specific return values.
-      assert.equal(result.userData.type, 'user')
-      assert.equal(result.userData.email, 'test973@test.com')
-      assert.equal(result.userData.name, 'test973')
-      assert.property(result.userData, '_id')
-      assert.property(result, 'token')
+      // assert.equal(result.userData.type, 'user')
+      // assert.equal(result.userData.email, 'test973@test.com')
+      // assert.equal(result.userData.name, 'test973')
+      // assert.property(result.userData, '_id')
+      // assert.property(result, 'token')
 
       // Generic JSON RPC return values
       assert.equal(result.endpoint, 'createUser')
@@ -141,8 +145,11 @@ describe('#UserRPC', () => {
       const rpcData = jsonrpc.parse(jsonStr)
       rpcData.from = 'Origin request'
 
+      // Force middleware to pass.
+      sandbox.stub(uut.validators, 'ensureUser').resolves(true)
+
       const result = await uut.userRouter(rpcData)
-      console.log('result', result)
+      // console.log('result', result)
       assert.equal(result, true)
     })
 
@@ -155,13 +162,16 @@ describe('#UserRPC', () => {
       const id = uid()
       const userCall = jsonrpc.request(id, 'users', {
         endpoint: 'updateUser',
-        apiToken: testUser.token,
-        userId: testUser.userData._id
+        apiToken: 'fakeJWTToken',
+        userId: 'abc123'
       })
       const jsonStr = JSON.stringify(userCall, null, 2)
       const rpcData = jsonrpc.parse(jsonStr)
       rpcData.from = 'Origin request'
 
+      // Force middleware to pass.
+      sandbox.stub(uut.validators, 'ensureTargetUserOrAdmin').resolves(true)
+
       const result = await uut.userRouter(rpcData)
       // console.log('result: ', result)
 
@@ -182,7 +192,12 @@ describe('#UserRPC', () => {
       const jsonStr = JSON.stringify(userCall, null, 2)
       const rpcData = jsonrpc.parse(jsonStr)
       rpcData.from = 'Origin request'
+
+      // Force middleware to pass.
+      sandbox.stub(uut.validators, 'ensureUser').resolves(true)
+
       const result = await uut.userRouter(rpcData)
+      // console.log('result: ', result)
 
       assert.equal(result, true)
     })
@@ -196,13 +211,16 @@ describe('#UserRPC', () => {
       const id = uid()
       const userCall = jsonrpc.request(id, 'users', {
         endpoint: 'deleteUser',
-        apiToken: testUser.token,
-        userId: testUser.userData._id
+        apiToken: 'fakeJWTToken',
+        userId: 'abc123'
       })
       const jsonStr = JSON.stringify(userCall, null, 2)
       const rpcData = jsonrpc.parse(jsonStr)
       rpcData.from = 'Origin request'
 
+      // Force middleware to pass.
+      sandbox.stub(uut.validators, 'ensureTargetUserOrAdmin').resolves(true)
+
       const result = await uut.userRouter(rpcData)
       // console.log('result: ', result)
 
@@ -238,7 +256,6 @@ describe('#UserRPC', () => {
 
       // Endpoint specific properties
       assert.property(result, 'users')
-      assert.isArray(result.users)
 
       // Generic JSON RPC return values
       assert.equal(result.endpoint, 'getAllUsers')
@@ -265,31 +282,32 @@ describe('#UserRPC', () => {
   describe('#updateUser', () => {
     it('should update a user', async () => {
       // Get the user model for the test user.
-      const testUserModel = await UserModel.findById(
-        testUser.userData._id,
-        '-password'
-      )
+      // const testUserModel = await UserModel.findById(
+      //   testUser.userData._id,
+      //   '-password'
+      // )
 
       // Generate the parsed data that the main router would pass to this
       // endpoint.
       const id = uid()
       const userCall = jsonrpc.request(id, 'users', {
         endpoint: 'updateUser',
-        userId: testUser.userData._id.toString(),
+        // userId: testUser.userData._id.toString(),
+        userId: 'abc123',
         name: 'test777'
       })
       const jsonStr = JSON.stringify(userCall, null, 2)
       const rpcData = jsonrpc.parse(jsonStr)
 
-      const result = await uut.updateUser(rpcData, testUserModel)
+      const result = await uut.updateUser(rpcData, {})
       // console.log('updateUser result: ', result)
 
       // Endpoint specific properties
       assert.property(result, 'user')
-      assert.property(result.user, 'type')
-      assert.property(result.user, '_id')
-      assert.property(result.user, 'email')
-      assert.property(result.user, 'name')
+      // assert.property(result.user, 'type')
+      // assert.property(result.user, '_id')
+      // assert.property(result.user, 'email')
+      // assert.property(result.user, 'name')
 
       // Generic JSON RPC return values
       assert.equal(result.endpoint, 'updateUser')
@@ -318,7 +336,7 @@ describe('#UserRPC', () => {
       const id = uid()
       const userCall = jsonrpc.request(id, 'users', {
         endpoint: 'getUser',
-        userId: testUser.userData._id.toString()
+        userId: 'abc123'
       })
       const jsonStr = JSON.stringify(userCall, null, 2)
       const rpcData = jsonrpc.parse(jsonStr)
@@ -328,10 +346,10 @@ describe('#UserRPC', () => {
 
       // Endpoint specific properties
       assert.property(result, 'user')
-      assert.property(result.user, 'type')
-      assert.property(result.user, '_id')
-      assert.property(result.user, 'email')
-      assert.property(result.user, 'name')
+      // assert.property(result.user, 'type')
+      // assert.property(result.user, '_id')
+      // assert.property(result.user, 'email')
+      // assert.property(result.user, 'name')
 
       // Generic JSON RPC return values
       assert.equal(result.endpoint, 'getUser')
@@ -356,19 +374,23 @@ describe('#UserRPC', () => {
   describe('#deleteUser', () => {
     it('should delete a user', async () => {
       // Get the user model for the test user.
-      const testUserModel = await UserModel.findById(
-        testUser.userData._id,
-        '-password'
-      )
+      // const testUserModel = await UserModel.findById(
+      //   testUser.userData._id,
+      //   '-password'
+      // )
 
-      await uut.deleteUser({}, testUserModel)
+      await uut.deleteUser({}, {})
       // console.log(result)
 
       assert.isOk('Not throwing an error is a success')
     })
 
     it('should return error data if biz logic throws an error', async () => {
-      // Force an error by not specifying an user ID.
+      // Force an error:
+      sandbox
+        .stub(uut.userLib, 'deleteUser')
+        .rejects(new Error('Cannot read property'))
+
       const result = await uut.deleteUser()
       // console.log('result: ', result)
 
diff --git a/test/unit/mocks/use-cases/index.js b/test/unit/mocks/use-cases/index.js
index fad5d8d..36d0fd1 100644
--- a/test/unit/mocks/use-cases/index.js
+++ b/test/unit/mocks/use-cases/index.js
@@ -1,7 +1,42 @@
 /*
   Mocks for the use cases.
 */
+/* eslint-disable */
 
-class UseCasesMock {}
+class UserUseCaseMock {
+  async createUser(userObj) {
+    return {}
+  }
+
+  async getAllUsers() {
+    return true
+  }
+
+  async getUser(params) {
+    return true
+  }
+
+  async updateUser(existingUser, newData) {
+    return true
+  }
+
+  async deleteUser(user) {
+    return true
+  }
+
+  async authUser(login, passwd) {
+    return {
+      generateToken: () => {}
+    }
+  }
+}
+
+class UseCasesMock {
+  constuctor(localConfig = {}) {
+    // this.user = new UserUseCaseMock(localConfig)
+  }
+
+  user = new UserUseCaseMock()
+}
 
 module.exports = UseCasesMock
diff --git a/test/unit/rest-api/a02-users.rest-unit.js b/test/unit/rest-api/a02-users.rest-unit.js
index 9a2fe5e..b2e7313 100644
--- a/test/unit/rest-api/a02-users.rest-unit.js
+++ b/test/unit/rest-api/a02-users.rest-unit.js
@@ -10,7 +10,8 @@ const mongoose = require('mongoose')
 // Local support libraries
 const config = require('../../../config')
 const testUtils = require('../../utils/test-utils')
-const User = require('../../../src/adapters/localdb/models/users')
+const adapters = require('../mocks/adapters')
+const UseCasesMock = require('../mocks/use-cases')
 
 const UserController = require('../../../src/controllers/rest-api/users/controller')
 let uut
@@ -20,7 +21,7 @@ let ctx
 const mockContext = require('../../unit/mocks/ctx-mock').context
 
 describe('Users', () => {
-  let testUser = {}
+  // const testUser = {}
 
   before(async () => {
     // Connect to the Mongo Database.
@@ -61,7 +62,8 @@ describe('Users', () => {
   })
 
   beforeEach(() => {
-    uut = new UserController()
+    const useCases = new UseCasesMock()
+    uut = new UserController({ adapters, useCases })
 
     sandbox = sinon.createSandbox()
 
@@ -107,7 +109,7 @@ describe('Users', () => {
       assert.property(ctx.response.body, 'token')
 
       // Used by downstream tests.
-      testUser = ctx.response.body.user
+      // testUser = ctx.response.body.user
       // console.log('testUser: ', testUser)
     })
   })
@@ -117,7 +119,7 @@ describe('Users', () => {
       try {
         // Force an error
         sandbox
-          .stub(uut.userLib, 'getAllUsers')
+          .stub(uut.useCases.user, 'getAllUsers')
           .rejects(new Error('test error'))
 
         await uut.getUsers(ctx)
@@ -144,7 +146,9 @@ describe('Users', () => {
     it('should return 422 status on arbitrary biz logic error', async () => {
       try {
         // Force an error
-        sandbox.stub(uut.userLib, 'getUser').rejects(new Error('test error'))
+        sandbox
+          .stub(uut.useCases.user, 'getUser')
+          .rejects(new Error('test error'))
 
         await uut.getUser(ctx)
 
@@ -157,7 +161,7 @@ describe('Users', () => {
 
     it('should return 200 status on success', async () => {
       // Mock dependencies
-      sandbox.stub(uut.userLib, 'getUser').resolves({ _id: '123' })
+      sandbox.stub(uut.useCases.user, 'getUser').resolves({ _id: '123' })
 
       await uut.getUser(ctx)
 
@@ -173,7 +177,7 @@ describe('Users', () => {
         // Mock dependencies
         const testErr = new Error('test error')
         testErr.status = 404
-        sandbox.stub(uut.userLib, 'getUser').rejects(testErr)
+        sandbox.stub(uut.useCases.user, 'getUser').rejects(testErr)
 
         await uut.getUser(ctx)
 
@@ -201,19 +205,22 @@ describe('Users', () => {
     it('should return 200 on success', async () => {
       // Prep the testUser data.
       // console.log('testUser: ', testUser)
-      testUser.password = 'password'
-      delete testUser.type
+      // testUser.password = 'password'
+      // delete testUser.type
 
       // Replace the testUser variable with an actual model from the DB.
-      const existingUser = await User.findById(testUser._id)
+      // const existingUser = await User.findById(testUser._id)
 
       ctx.body = {
-        user: existingUser
+        user: {}
       }
       ctx.request.body = {
-        user: testUser
+        user: {}
       }
 
+      // Mock dependencies
+      sandbox.stub(uut.useCases.user, 'updateUser').resolves({})
+
       await uut.updateUser(ctx)
 
       // Assert the expected HTTP response
@@ -239,7 +246,7 @@ describe('Users', () => {
 
     it('should return 200 status on success', async () => {
       // Replace the testUser variable with an actual model from the DB.
-      const existingUser = await User.findById(testUser._id)
+      const existingUser = {}
 
       ctx.body = {
         user: existingUser
diff --git a/test/unit/biz-logic/a02-users.lib-unit.js b/test/unit/use-cases/users.use-case.unit.js
similarity index 98%
rename from test/unit/biz-logic/a02-users.lib-unit.js
rename to test/unit/use-cases/users.use-case.unit.js
index f1b9ef8..06cc853 100644
--- a/test/unit/biz-logic/a02-users.lib-unit.js
+++ b/test/unit/use-cases/users.use-case.unit.js
@@ -15,6 +15,8 @@ const testUtils = require('../../utils/test-utils')
 
 // Unit under test (uut)
 const UserLib = require('../../../src/use-cases/user')
+const adapters = require('../mocks/adapters')
+const UseCasesMock = require('../mocks/use-cases')
 
 describe('#users', () => {
   let uut
@@ -38,7 +40,9 @@ describe('#users', () => {
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
-    uut = new UserLib()
+    const useCases = new UseCasesMock()
+
+    uut = new UserLib({ adapters, useCases })
   })
 
   afterEach(() => sandbox.restore())

From d5643dc08678055d31a6fbef41cc0943b3448f28 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sat, 10 Jul 2021 21:08:00 -0700
Subject: [PATCH 28/43] Got tests working again

---
 package.json                                  |   2 +-
 .../nodemailer.adapter.unit.js}               |   0
 test/unit/mocks/adapters/index.js             |  26 +
 test/unit/old-tests/a01-auth.spec.js          | 103 ---
 test/unit/old-tests/a02-users.spec.js         | 851 ------------------
 test/unit/old-tests/a03-nodemailer.spec.js    | 204 -----
 test/unit/old-tests/a04-contact.spec.js       | 267 ------
 test/unit/old-tests/a05-passport.spec.js      |  46 -
 test/unit/old-tests/a06-logapi.spec.js        | 251 ------
 test/unit/old-tests/a07-json-files.spec.js    | 139 ---
 test/unit/old-tests/a08-validators.spec.js    | 317 -------
 test/unit/old-tests/a09-admin.spec.js         | 116 ---
 test/unit/old-tests/utils.js                  | 135 ---
 test/unit/use-cases/users.use-case.unit.js    |  85 +-
 14 files changed, 77 insertions(+), 2465 deletions(-)
 rename test/unit/{biz-logic/a03-nodemailer.lib-unit.js => adapters/nodemailer.adapter.unit.js} (100%)
 delete mode 100644 test/unit/old-tests/a01-auth.spec.js
 delete mode 100644 test/unit/old-tests/a02-users.spec.js
 delete mode 100644 test/unit/old-tests/a03-nodemailer.spec.js
 delete mode 100644 test/unit/old-tests/a04-contact.spec.js
 delete mode 100644 test/unit/old-tests/a05-passport.spec.js
 delete mode 100644 test/unit/old-tests/a06-logapi.spec.js
 delete mode 100644 test/unit/old-tests/a07-json-files.spec.js
 delete mode 100644 test/unit/old-tests/a08-validators.spec.js
 delete mode 100644 test/unit/old-tests/a09-admin.spec.js
 delete mode 100644 test/unit/old-tests/utils.js

diff --git a/package.json b/package.json
index 1df7e39..fac6e88 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "start": "node index.js",
     "test": "npm run test:all",
-    "test:all": "export SVC_ENV=test && nyc --reporter=text mocha --exit --timeout 15000 test/unit/biz-logic/ test/unit/json-rpc/ test/unit/rest-api/ test/e2e/automated/",
+    "test:all": "export SVC_ENV=test && nyc --reporter=text mocha --exit --timeout 15000 --recursive test/unit test/e2e/automated/",
     "test:unit:lib": "export SVC_ENV=test && mocha --exit --timeout 15000 test/unit/biz-logic/",
     "test:unit:rest": "export SVC_ENV=test && mocha --exit --timeout 15000 test/unit/rest-api/",
     "test:unit:jsonrpc": "export SVC_ENV=test && mocha --exit --timeout 15000 test/unit/json-rpc/",
diff --git a/test/unit/biz-logic/a03-nodemailer.lib-unit.js b/test/unit/adapters/nodemailer.adapter.unit.js
similarity index 100%
rename from test/unit/biz-logic/a03-nodemailer.lib-unit.js
rename to test/unit/adapters/nodemailer.adapter.unit.js
diff --git a/test/unit/mocks/adapters/index.js b/test/unit/mocks/adapters/index.js
index 4bd83dc..bdabe0b 100644
--- a/test/unit/mocks/adapters/index.js
+++ b/test/unit/mocks/adapters/index.js
@@ -14,6 +14,32 @@ const ipfs = {
 const localdb = {
   Users: class Users {
     static findById () {}
+    static find () {}
+    static findOne () {
+      return {
+        validatePassword: localdb.validatePassword
+      }
+    }
+
+    async save () {
+      return {}
+    }
+
+    generateToken () {
+      return '123'
+    }
+
+    toJSON () {
+      return {}
+    }
+
+    async remove () {
+      return true
+    }
+  },
+
+  validatePassword: () => {
+    return true
   }
 }
 
diff --git a/test/unit/old-tests/a01-auth.spec.js b/test/unit/old-tests/a01-auth.spec.js
deleted file mode 100644
index 706c846..0000000
--- a/test/unit/old-tests/a01-auth.spec.js
+++ /dev/null
@@ -1,103 +0,0 @@
-const app = require('../../bin/server')
-const utils = require('./utils')
-const config = require('../../config')
-const assert = require('chai').assert
-
-const axios = require('axios').default
-
-// const request = supertest.agent(app.listen())
-const context = {}
-
-const LOCALHOST = `http://localhost:${config.port}`
-
-describe('Auth', () => {
-  before(async () => {
-    // await utils.cleanDb() // This should be first instruction.
-
-    await app.startServer() // This should be second instruction.
-
-    const userObj = {
-      email: 'test@test.com',
-      password: 'pass'
-    }
-    const testUser = await utils.createUser(userObj)
-    console.log(`TestUser : ${testUser}`)
-
-    context.user = testUser.user
-    context.token = testUser.token
-  })
-
-  describe('POST /auth', () => {
-    it('should throw 401 if credentials are incorrect', async () => {
-      try {
-        const options = {
-          method: 'post',
-          url: `${LOCALHOST}/auth`,
-          data: {
-            email: 'test@test.com',
-            password: 'wrongpassword'
-          }
-        }
-
-        const result = await axios(options)
-
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        console.log(
-          `result stringified: ${JSON.stringify(result.data, null, 2)}`
-        )
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert(err.response.status === 401, 'Error code 401 expected.')
-      }
-    })
-
-    it('should throw 401 if email is wrong format', async () => {
-      try {
-        const options = {
-          method: 'post',
-          url: `${LOCALHOST}/auth`,
-          data: {
-            email: 'wrongEmail',
-            password: 'wrongpassword'
-          }
-        }
-
-        await axios(options)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert(err.response.status === 401, 'Error code 401 expected.')
-      }
-    })
-
-    it('should auth user', async () => {
-      try {
-        const options = {
-          method: 'post',
-          url: `${LOCALHOST}/auth`,
-          data: {
-            email: 'test@test.com',
-            password: 'pass'
-          }
-        }
-        const result = await axios(options)
-        // console.log(`result: ${JSON.stringify(result.data, null, 2)}`)
-
-        assert(result.status === 200, 'Status Code 200 expected.')
-        assert(
-          result.data.user.email === 'test@test.com',
-          'Email of test expected'
-        )
-        assert(
-          result.data.user.password === undefined,
-          'Password expected to be omited'
-        )
-      } catch (err) {
-        console.log(
-          'Error authenticating test user: ' + JSON.stringify(err, null, 2)
-        )
-        throw err
-      }
-    })
-  })
-})
diff --git a/test/unit/old-tests/a02-users.spec.js b/test/unit/old-tests/a02-users.spec.js
deleted file mode 100644
index 774fca1..0000000
--- a/test/unit/old-tests/a02-users.spec.js
+++ /dev/null
@@ -1,851 +0,0 @@
-const testUtils = require('./utils')
-const assert = require('chai').assert
-const config = require('../../config')
-const axios = require('axios').default
-const sinon = require('sinon')
-
-const util = require('util')
-util.inspect.defaultOptions = { depth: 1 }
-
-const LOCALHOST = `http://localhost:${config.port}`
-
-const context = {}
-
-const UserController = require('../../src/modules/users/controller')
-let uut
-let sandbox
-
-const mockContext = require('./mocks/ctx-mock').context
-
-describe('Users', () => {
-  before(async () => {
-    // console.log(`config: ${JSON.stringify(config, null, 2)}`)
-
-    // Create a second test user.
-    const userObj = {
-      email: 'test2@test.com',
-      password: 'pass2'
-    }
-    const testUser = await testUtils.createUser(userObj)
-    // console.log(`testUser2: ${JSON.stringify(testUser, null, 2)}`)
-
-    context.user2 = testUser.user
-    context.token2 = testUser.token
-    context.id2 = testUser.user._id
-
-    // Get the JWT used to log in as the admin 'system' user.
-    const adminJWT = await testUtils.getAdminJWT()
-    // console.log(`adminJWT: ${adminJWT}`)
-    context.adminJWT = adminJWT
-
-    // const admin = await testUtils.loginAdminUser()
-    // context.adminJWT = admin.token
-
-    // const admin = await adminLib.loginAdmin()
-    // console.log(`admin: ${JSON.stringify(admin, null, 2)}`)
-  })
-
-  beforeEach(() => {
-    uut = new UserController()
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('POST /users', () => {
-    it('should reject signup when data is incomplete', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/users`,
-          data: {
-            email: 'test2@test.com'
-          }
-        }
-
-        await axios(options)
-
-        /*      console.log(
-          `result stringified: ${JSON.stringify(result.data, null, 2)}`
-        ) */
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert(err.response.status === 422, 'Error code 422 expected.')
-      }
-    })
-
-    it('should reject signup if no email property is provided', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/users`,
-          data: {
-            user: {
-              password: 'pass2'
-            }
-          }
-        }
-        await axios(options)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        // console.log('err', err)
-        assert.equal(err.response.status, 422)
-        assert.include(err.response.data, "Property 'email' must be a string")
-      }
-    })
-
-    // it('should reject signup if email property provided in wrong format', async () => {
-    //   try {
-    //     const options = {
-    //       method: 'POST',
-    //       url: `${LOCALHOST}/users`,
-    //       data: {
-    //         user: {
-    //           email: 'badEmailFormat',
-    //           password: 'test'
-    //         }
-    //       }
-    //     }
-    //     await axios(options)
-    //
-    //     assert(false, 'Unexpected result')
-    //   } catch (err) {
-    //     assert.equal(err.response.status, 422)
-    //     assert.include(
-    //       err.response.data,
-    //       "Property 'email' must be email format"
-    //     )
-    //   }
-    // })
-
-    it('should reject signup if no password property is provided', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/users`,
-          data: {
-            user: {
-              email: 'test2@test.com'
-            }
-          }
-        }
-        await axios(options)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'password' must be a string"
-        )
-      }
-    })
-
-    it('should reject  if name property property is not string', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/users`,
-          data: {
-            user: {
-              email: 'test322@test.com',
-              password: 'supersecretpassword',
-              name: 1234
-            }
-          }
-        }
-        await axios(options)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(err.response.data, "Property 'name' must be a string")
-      }
-    })
-
-    it("should signup of type 'user' by default", async () => {
-      const options = {
-        method: 'post',
-        url: `${LOCALHOST}/users`,
-        data: {
-          user: {
-            email: 'test3@test.com',
-            password: 'supersecretpassword'
-          }
-        }
-      }
-      const result = await axios(options)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      context.user = result.data.user
-      context.token = result.data.token
-
-      assert(result.status === 200, 'Status Code 200 expected.')
-      assert(
-        result.data.user.email === 'test3@test.com',
-        'Email of test expected'
-      )
-      assert(
-        result.data.user.password === undefined,
-        'Password expected to be omited'
-      )
-      assert.property(result.data, 'token', 'Token property exists.')
-      assert.equal(result.data.user.type, 'user')
-    })
-  })
-
-  describe('GET /users', () => {
-    it('should not fetch users if the authorization header is missing', async () => {
-      try {
-        const options = {
-          method: 'GET',
-          url: `${LOCALHOST}/users`,
-          headers: {
-            Accept: 'application/json'
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should not fetch users if the authorization header is missing the scheme', async () => {
-      try {
-        const options = {
-          method: 'GET',
-          url: `${LOCALHOST}/users`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: '1'
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should not fetch users if the authorization header has invalid scheme', async () => {
-      const { token } = context
-      try {
-        const options = {
-          method: 'GET',
-          url: `${LOCALHOST}/users`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Unknown ${token}`
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should not fetch users if token is invalid', async () => {
-      try {
-        const options = {
-          method: 'GET',
-          url: `${LOCALHOST}/users`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: 'Bearer 1'
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should fetch all users', async () => {
-      const { token } = context
-
-      const options = {
-        method: 'GET',
-        url: `${LOCALHOST}/users`,
-        headers: {
-          Accept: 'application/json',
-          Authorization: `Bearer ${token}`
-        }
-      }
-      const result = await axios(options)
-
-      const users = result.data.users
-      // console.log(`users: ${util.inspect(users)}`)
-
-      assert.hasAnyKeys(users[0], ['type', '_id', 'email'])
-      assert.isNumber(users.length)
-    })
-
-    it('should catch and handle errors', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.User, 'find').rejects(new Error('test error'))
-
-        // Mock the context object.
-        const ctx = mockContext()
-
-        await uut.getUsers(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Not Found')
-      }
-    })
-  })
-
-  describe('GET /users/:id', () => {
-    it('should not fetch user if token is invalid', async () => {
-      try {
-        const options = {
-          method: 'GET',
-          url: `${LOCALHOST}/users/1`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: 'Bearer 1'
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it("should throw 404 if user doesn't exist", async () => {
-      const { token } = context
-
-      try {
-        const options = {
-          method: 'GET',
-          url: `${LOCALHOST}/users/1`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Bearer ${token}`
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 404)
-      }
-    })
-
-    it('should fetch own user', async () => {
-      const _id = context.user._id
-      const token = context.token
-
-      const options = {
-        method: 'GET',
-        url: `${LOCALHOST}/users/${_id}`,
-        headers: {
-          Accept: 'application/json',
-          Authorization: `Bearer ${token}`
-        }
-      }
-      const result = await axios(options)
-
-      const user = result.data.user
-      // console.log(`user: ${util.inspect(user)}`)
-
-      assert.property(user, 'type')
-      assert.property(user, 'email')
-
-      assert.property(user, '_id')
-      assert.equal(user._id, _id)
-
-      assert.notProperty(
-        user,
-        'password',
-        'Password property should not be returned'
-      )
-    })
-
-    it('should catch and handle errors', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.User, 'findById').rejects(new Error('test error'))
-
-        // Mock the context object.
-        const ctx = mockContext()
-
-        await uut.getUser(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Internal Server Error')
-      }
-    })
-
-    it('should handle user not found', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.User, 'findById').resolves(false)
-
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.params = { id: 1 }
-
-        await uut.getUser(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        // console.log(err)
-        assert.include(err.message, 'Not Found')
-      }
-    })
-  })
-
-  describe('PUT /users/:id', () => {
-    it('should not update user if token is invalid', async () => {
-      try {
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/1`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: 'Bearer 1'
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should throw 401 if non-admin updating other user', async () => {
-      const { token } = context
-
-      try {
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/1`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Bearer ${token}`
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should not be able to update user type', async () => {
-      try {
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/${context.user._id.toString()}`,
-          headers: {
-            Authorization: `Bearer ${context.token}`
-          },
-          data: {
-            user: {
-              name: 'new name',
-              type: 'test'
-            }
-          }
-        }
-        await axios(options)
-
-        // console.log(`Users: ${JSON.stringify(result.data, null, 2)}`)
-
-        // assert(result.status === 200, 'Status Code 200 expected.')
-        // assert(result.data.user.type === 'user', 'Type should be unchanged.')
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'type' can only be changed by Admin user"
-        )
-      }
-    })
-
-    it('should not be able to update other user when not admin', async () => {
-      try {
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/${context.user2._id.toString()}`,
-          headers: {
-            Authorization: `Bearer ${context.token}`
-          },
-          data: {
-            user: {
-              name: 'This should not work'
-            }
-          }
-        }
-        await axios(options)
-
-        // console.log(`result: ${JSON.stringify(result.data, null, 2)}`)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should not be able to update if name property is wrong', async () => {
-      try {
-        const _id = context.user._id
-        const token = context.token
-
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/${_id}`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Bearer ${token}`
-          },
-          data: {
-            user: {
-              email: 'testToUpdate@test.com',
-              name: {}
-            }
-          }
-        }
-        await axios(options)
-      } catch (error) {
-        assert.equal(error.response.status, 422)
-        assert.include(error.response.data, "Property 'name' must be a string!")
-      }
-    })
-    it('should not be able to update if password property is not string', async () => {
-      const { token } = context
-      const _id = context.user._id
-      try {
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/${_id}`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Bearer ${token}`
-          },
-          data: {
-            user: {
-              password: 1234
-            }
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'password' must be a string!"
-        )
-      }
-    })
-    it('should not be able to update if project property is not array', async () => {
-      const { token } = context
-      const _id = context.user._id
-      try {
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/${_id}`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Bearer ${token}`
-          },
-          data: {
-            user: {
-              projects: 'projects'
-            }
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'projects' must be a Array!"
-        )
-      }
-    })
-    it('should not be able to update if email is not string', async () => {
-      const { token } = context
-      const _id = context.user._id
-      try {
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/${_id}`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Bearer ${token}`
-          },
-          data: {
-            user: {
-              email: 1234
-            }
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(err.response.data, "Property 'email' must be a string!")
-      }
-    })
-    it('should not be able to update if email is wrong format', async () => {
-      try {
-        const _id = context.user._id
-        const token = context.token
-
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/${_id}`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Bearer ${token}`
-          },
-          data: {
-            user: {
-              email: 'badEmailFormat'
-            }
-          }
-        }
-        await axios(options)
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'email' must be email format!"
-        )
-      }
-    })
-    it('should not be able to update type property if is not string', async () => {
-      try {
-        const _id = context.user._id
-        const token = context.token
-
-        const options = {
-          method: 'PUT',
-          url: `${LOCALHOST}/users/${_id}`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Bearer ${token}`
-          },
-          data: {
-            user: {
-              type: 1
-            }
-          }
-        }
-        await axios(options)
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(err.response.data, "Property 'type' must be a string!")
-      }
-    })
-
-    it('should be able to update other user when admin', async () => {
-      const adminJWT = context.adminJWT
-
-      const options = {
-        method: 'PUT',
-        url: `${LOCALHOST}/users/${context.user2._id.toString()}`,
-        headers: {
-          Authorization: `Bearer ${adminJWT}`
-        },
-        data: {
-          user: {
-            name: 'This should work'
-          }
-        }
-      }
-      const result = await axios(options)
-      // console.log(`result stringified: ${JSON.stringify(result, null, 2)}`)
-
-      const userName = result.data.user.name
-      assert.equal(userName, 'This should work')
-    })
-    it('should update user with minimum inputs', async () => {
-      const _id = context.user._id
-      const token = context.token
-
-      const options = {
-        method: 'PUT',
-        url: `${LOCALHOST}/users/${_id}`,
-        headers: {
-          Accept: 'application/json',
-          Authorization: `Bearer ${token}`
-        },
-        data: {
-          user: { email: 'testToUpdate@test.com' }
-        }
-      }
-
-      const result = await axios(options)
-      const user = result.data.user
-      // console.log(`user: ${util.inspect(user)}`)
-
-      assert.property(user, 'type')
-      assert.property(user, 'email')
-
-      assert.property(user, '_id')
-      assert.equal(user._id, _id)
-
-      assert.notProperty(
-        user,
-        'password',
-        'Password property should not be returned'
-      )
-      assert.equal(user.email, 'testToUpdate@test.com')
-    })
-
-    it('should update user with all inputs', async () => {
-      const _id = context.user._id
-      const token = context.token
-
-      const options = {
-        method: 'PUT',
-        url: `${LOCALHOST}/users/${_id}`,
-        headers: {
-          Accept: 'application/json',
-          Authorization: `Bearer ${token}`
-        },
-        data: {
-          user: {
-            email: 'testToUpdate@test.com',
-            name: 'my name',
-            username: 'myUsername'
-          }
-        }
-      }
-      const result = await axios(options)
-
-      const user = result.data.user
-      // console.log(`user: ${util.inspect(user)}`)
-
-      assert.property(user, 'type')
-      assert.property(user, 'email')
-      assert.property(user, 'name')
-
-      assert.property(user, '_id')
-      assert.equal(user._id, _id)
-      assert.notProperty(
-        user,
-        'password',
-        'Password property should not be returned'
-      )
-      assert.equal(user.name, 'my name')
-      assert.equal(user.email, 'testToUpdate@test.com')
-      assert.equal(user.username, 'myUsername')
-    })
-  })
-
-  describe('DELETE /users/:id', () => {
-    it('should not delete user if token is invalid', async () => {
-      try {
-        const options = {
-          method: 'DELETE',
-          url: `${LOCALHOST}/users/1`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: 'Bearer 1'
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should throw 401 if deleting invalid user', async () => {
-      const { token } = context
-
-      try {
-        const options = {
-          method: 'DELETE',
-          url: `${LOCALHOST}/users/1`,
-          headers: {
-            Accept: 'application/json',
-            Authorization: `Bearer ${token}`
-          }
-        }
-        await axios(options)
-
-        assert.equal(true, false, 'Unexpected behavior')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should not be able to delete other users unless admin', async () => {
-      try {
-        const options = {
-          method: 'DELETE',
-          url: `${LOCALHOST}/users/${context.user2._id.toString()}`,
-          headers: {
-            Authorization: `Bearer ${context.token}`
-          }
-        }
-        await axios(options)
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-      }
-    })
-
-    it('should delete own user', async () => {
-      const _id = context.user._id
-      const token = context.token
-
-      const options = {
-        method: 'DELETE',
-        url: `${LOCALHOST}/users/${_id}`,
-        headers: {
-          Accept: 'application/json',
-          Authorization: `Bearer ${token}`
-        }
-      }
-      const result = await axios(options)
-      // console.log(`result: ${util.inspect(result.data.success)}`)
-
-      assert.equal(result.data.success, true)
-    })
-
-    it('should be able to delete other users when admin', async () => {
-      const id = context.id2
-      const adminJWT = context.adminJWT
-
-      const options = {
-        method: 'DELETE',
-        url: `${LOCALHOST}/users/${id}`,
-        headers: {
-          Accept: 'application/json',
-          Authorization: `Bearer ${adminJWT}`
-        }
-      }
-      const result = await axios(options)
-      // console.log(`result: ${util.inspect(result.data)}`)
-
-      assert.equal(result.data.success, true)
-    })
-  })
-})
diff --git a/test/unit/old-tests/a03-nodemailer.spec.js b/test/unit/old-tests/a03-nodemailer.spec.js
deleted file mode 100644
index 838bd2a..0000000
--- a/test/unit/old-tests/a03-nodemailer.spec.js
+++ /dev/null
@@ -1,204 +0,0 @@
-const assert = require('chai').assert
-
-const NodeMailer = require('../../src/lib/nodemailer')
-
-const sinon = require('sinon')
-
-const util = require('util')
-util.inspect.defaultOptions = { depth: 1 }
-
-let sandbox
-let uut
-describe('NodeMailer', () => {
-  beforeEach(() => {
-    uut = new NodeMailer()
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('sendEmail()', () => {
-    it('should throw error if email property is not provided', async () => {
-      try {
-        const data = {
-          formMessage: 'test msg',
-          name: 'test name',
-          subject: 'test subject',
-          to: ['test2@email.com']
-        }
-        await uut.sendEmail(data)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Property \'email\' must be a string!')
-      }
-    })
-    it('should throw error if email property is wrong format', async () => {
-      try {
-        const data = {
-          email: 'test',
-          formMessage: 'test msg',
-          name: 'test name',
-          subject: 'test subject',
-          to: ['test2@email.com']
-        }
-        await uut.sendEmail(data)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Property \'email\' must be email format!')
-      }
-    })
-    it('should throw error if formMessage property is not provided', async () => {
-      try {
-        const data = {
-          email: 'test@email.com',
-          name: 'test name',
-          subject: 'test subject',
-          to: ['test2@email.com']
-        }
-        await uut.sendEmail(data)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Property \'message\' must be a string!')
-      }
-    })
-    it('should throw error if <to> property is not provided', async () => {
-      try {
-        const data = {
-          email: 'test@email.com',
-          name: 'test name',
-          subject: 'test subject'
-        }
-        await uut.sendEmail(data)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Property \'to\' must be a array!')
-      }
-    })
-
-    it('should throw error if  <to> is wrong format', async () => {
-      try {
-        const data = {
-          email: 'test@email.com',
-          formMessage: 'test msg',
-          name: 'test name',
-          subject: 'test subject',
-          to: ['test']
-        }
-        await uut.sendEmail(data)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Array must contain emails format!')
-      }
-    })
-
-    it('should throw error if subject Property is not provided', async () => {
-      try {
-        const data = {
-          email: 'test@email.com',
-          formMessage: 'test msg',
-          name: 'test name',
-          to: ['test2@email.com']
-        }
-        await uut.sendEmail(data)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Property \'subject\' must be a string!')
-      }
-    })
-    it('should throw error if payloadTitle property is not provided', async () => {
-      try {
-        const data = {
-          email: 'test@email.com',
-          formMessage: 'test msg',
-          name: 'test name',
-          subject: 'test subject',
-          to: ['test2@email.com']
-        }
-        await uut.sendEmail(data)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Property \'payloadTitle\' must be a string!')
-      }
-    })
-    it('should throw error if payloadTitle property is not string', async () => {
-      try {
-        const data = {
-          email: 'test@email.com',
-          formMessage: 'test msg',
-          name: 'test name',
-          subject: 'test subject',
-          to: ['test2@email.com'],
-          payloadTitle: true
-
-        }
-        await uut.sendEmail(data)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Property \'payloadTitle\' must be a string!')
-      }
-    })
-
-    it('should send email', async () => {
-      try {
-        sandbox.stub(uut.transporter, 'sendMail').resolves({ messageId: 'messageId' })
-        const data = {
-          email: 'test@email.com',
-          formMessage: 'test msg',
-          name: 'test name',
-          to: ['test2@email.com'],
-          subject: 'test subject',
-          payloadTitle: 'test title'
-        }
-        const info = await uut.sendEmail(data)
-        assert.isObject(info)
-        assert.isString(info.messageId)
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-  describe('validateEmailArray()', () => {
-    it('should throw error if email list is not provided ', async () => {
-      try {
-        await uut.validateEmailArray()
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Property \'emailList\' must be a array!')
-      }
-    })
-    it('should throw error if email list is empty', async () => {
-      try {
-        const emailList = []
-        await uut.validateEmailArray(emailList)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Property \'emailList\' cant be empty!')
-      }
-    })
-    it('should throw error if email list contain wrong format', async () => {
-      try {
-        const emailList = [
-          'wrongEmail',
-          'bad format'
-        ]
-        await uut.validateEmailArray(emailList)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Array must contain emails format!')
-      }
-    })
-    it('should return true if email list contain email format', async () => {
-      try {
-        const emailList = [
-          'test@email.com',
-          'simple@email.com'
-        ]
-        const result = await uut.validateEmailArray(emailList)
-        assert.isTrue(result)
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-})
diff --git a/test/unit/old-tests/a04-contact.spec.js b/test/unit/old-tests/a04-contact.spec.js
deleted file mode 100644
index 2197cde..0000000
--- a/test/unit/old-tests/a04-contact.spec.js
+++ /dev/null
@@ -1,267 +0,0 @@
-const config = require('../../config')
-const axios = require('axios').default
-const assert = require('chai').assert
-const sinon = require('sinon')
-
-// Mock data
-// const mockData = require('./mocks/contact-mocks')
-
-const LOCALHOST = `http://localhost:${config.port}`
-
-const mockContext = require('./mocks/ctx-mock').context
-const ContactController = require('../../src/modules/contact/controller')
-let uut
-let sandbox
-
-describe('Contact', () => {
-  beforeEach(() => {
-    uut = new ContactController()
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('POST /contact/email', () => {
-    it('should throw error if email property is not provided', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/contact/email`,
-          data: {
-            obj: {
-              formMessage: 'message'
-            }
-          }
-        }
-
-        await axios(options)
-
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        // console.log(`result stringified: ${JSON.stringify(result, null, 2)}`)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(err.response.data, "Property 'email' must be a string!")
-      }
-    })
-
-    it('should throw error if email property is wrong format', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/contact/email`,
-          data: {
-            obj: {
-              email: 'email',
-              formMessage: 'test message'
-            }
-          }
-        }
-
-        await axios(options)
-
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        // console.log(`result stringified: ${JSON.stringify(result, null, 2)}`)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'email' must be email format!"
-        )
-      }
-    })
-
-    it('should throw error if formMessage property is not provided', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/contact/email`,
-          data: {
-            obj: {
-              email: 'email@email.com'
-            }
-          }
-        }
-
-        await axios(options)
-
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        // console.log(`result stringified: ${JSON.stringify(result, null, 2)}`)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'message' must be a string!"
-        )
-      }
-    })
-
-    it('should throw error if payloadTitle property is not provided', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/contact/email`,
-          data: {
-            obj: {
-              email: 'email@email.com',
-              formMessage: 'test message'
-            }
-          }
-        }
-
-        await axios(options)
-
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        // console.log(`result stringified: ${JSON.stringify(result, null, 2)}`)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'payloadTitle' must be a string!"
-        )
-      }
-    })
-
-    it('should throw error if payloadTitle property is not string', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/contact/email`,
-          data: {
-            obj: {
-              email: 'email@email.com',
-              formMessage: 'test message',
-              payloadTitle: 1
-            }
-          }
-        }
-
-        await axios(options)
-
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        // console.log(`result stringified: ${JSON.stringify(result, null, 2)}`)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'payloadTitle' must be a string!"
-        )
-      }
-    })
-
-    it('should throw error if email list provided is not a array', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/contact/email`,
-          data: {
-            obj: {
-              email: 'email@email.com',
-              formMessage: 'test message',
-              payloadTitle: 'title',
-              emailList: 1
-            }
-          }
-        }
-
-        await axios(options)
-
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        // console.log(`result stringified: ${JSON.stringify(result, null, 2)}`)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'emailList' must be a array of emails!"
-        )
-      }
-    })
-
-    it('should throw error if email list provided is a empty array', async () => {
-      try {
-        const options = {
-          method: 'POST',
-          url: `${LOCALHOST}/contact/email`,
-          data: {
-            obj: {
-              email: 'email@email.com',
-              formMessage: 'test message',
-              payloadTitle: 'title',
-              emailList: []
-            }
-          }
-        }
-
-        await axios(options)
-
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        // console.log(`result stringified: ${JSON.stringify(result, null, 2)}`)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 422)
-        assert.include(
-          err.response.data,
-          "Property 'emailList' must be a array of emails!"
-        )
-      }
-    })
-
-    it('should send email with minimun input', async () => {
-      try {
-        // Mock live network calls.
-        sandbox.stub(uut.nodemailer, 'sendEmail').resolves(true)
-
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.request = {
-          body: {
-            obj: {
-              email: 'email@email.com',
-              formMessage: 'test message',
-              payloadTitle: 'title'
-            }
-          }
-        }
-        await uut.email(ctx)
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-
-    it('should send email with  all input', async () => {
-      try {
-        // Mock live network calls.
-        sandbox.stub(uut.nodemailer, 'sendEmail').resolves(true)
-
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.request = {
-          body: {
-            obj: {
-              email: 'email@email.com',
-              formMessage: 'test message',
-              payloadTitle: 'title',
-              emailList: ['email@email.com']
-            }
-          }
-        }
-        await uut.email(ctx)
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-})
diff --git a/test/unit/old-tests/a05-passport.spec.js b/test/unit/old-tests/a05-passport.spec.js
deleted file mode 100644
index 52ad972..0000000
--- a/test/unit/old-tests/a05-passport.spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-const assert = require('chai').assert
-const PassportLib = require('../../src/lib/passport')
-
-const sinon = require('sinon')
-
-let uut
-let sandbox
-
-describe('#passport.js', () => {
-  beforeEach(() => {
-    uut = new PassportLib()
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('authUser()', () => {
-    it('should throw error if ctx is not provided', async () => {
-      try {
-        await uut.authUser()
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'ctx is required')
-      }
-    })
-
-    it('Should throw error if the passport library fails', async () => {
-      try {
-        const error = new Error('cant auth user')
-        const user = null
-
-        // Mock calls
-        // https://sinonjs.org/releases/latest/stubs/
-        // About yields
-        sandbox.stub(uut.passport, 'authenticate').yields(error, user)
-
-        const ctx = {}
-        await uut.authUser(ctx)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'cant auth user')
-      }
-    })
-  })
-})
diff --git a/test/unit/old-tests/a06-logapi.spec.js b/test/unit/old-tests/a06-logapi.spec.js
deleted file mode 100644
index 9705f0b..0000000
--- a/test/unit/old-tests/a06-logapi.spec.js
+++ /dev/null
@@ -1,251 +0,0 @@
-const config = require('../../config')
-const assert = require('chai').assert
-
-const axios = require('axios').default
-const sinon = require('sinon')
-
-const util = require('util')
-util.inspect.defaultOptions = { depth: 1 }
-
-const LOCALHOST = `http://localhost:${config.port}`
-
-const LogsController = require('../../src/modules/logapi/controller')
-const mockContext = require('./mocks/ctx-mock').context
-const mockData = require('./mocks/log-api-mock')
-
-const context = {}
-let sandbox
-let uut
-describe('LogsApi', () => {
-  beforeEach(() => {
-    uut = new LogsController()
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('POST /logapi', () => {
-    it('should return false if password is not provided', async () => {
-      try {
-        const options = {
-          method: 'post',
-          url: `${LOCALHOST}/logapi`,
-          data: {}
-        }
-
-        const result = await axios(options)
-        assert.isFalse(result.data.success)
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-    it('should return log', async () => {
-      try {
-        const options = {
-          method: 'post',
-          url: `${LOCALHOST}/logapi`,
-          data: {
-            password: 'test'
-          }
-        }
-
-        const result = await axios(options)
-
-        assert.isTrue(result.data.success)
-        assert.isArray(result.data.data)
-        assert.property(result.data.data[0], 'message')
-        assert.property(result.data.data[0], 'level')
-        assert.property(result.data.data[0], 'timestamp')
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-    it('should return false if files are not found!', async () => {
-      try {
-        sandbox.stub(uut, 'generateFileName').resolves('bad router')
-
-        const ctx = mockContext()
-        ctx.request = {
-          body: {
-            password: 'test'
-          }
-        }
-        await uut.getLogs(ctx)
-
-        assert.isFalse(ctx.body.success)
-        assert.include(ctx.body.data, 'file does not exist')
-      } catch (err) {
-        assert.fail('Unexpected result')
-      }
-    })
-    it('should catch and handle errors', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.fs, 'existsSync').throws(new Error('test error'))
-
-        // Mock the context object.
-        const ctx = mockContext()
-
-        ctx.request = {
-          body: {
-            password: 'test'
-          }
-        }
-
-        await uut.getLogs(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-    it('should throw unhandled error', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.fs, 'existsSync').throws(new Error())
-
-        // Mock the context object.
-        const ctx = mockContext()
-
-        ctx.request = {
-          body: {
-            password: 'test'
-          }
-        }
-
-        await uut.getLogs(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Unhandled error')
-      }
-    })
-  })
-  describe('#filterLogs()', () => {
-    it('should throw error if data is not provided', async () => {
-      try {
-        await uut.filterLogs()
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Data must be array')
-      }
-    })
-    it('should throw error if data provided is not an array', async () => {
-      try {
-        const data = 'data'
-        await uut.filterLogs(data)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'Data must be array')
-      }
-    })
-    it('should sort the log data', async () => {
-      try {
-        const data = mockData.data
-        const result = await uut.filterLogs(data)
-        assert.isArray(result)
-        assert.property(result[1], 'message')
-        assert.property(result[1], 'level')
-        assert.property(result[1], 'timestamp')
-      } catch (err) {
-        assert.fail('Unexpected result')
-      }
-    })
-    it('should sort the log data with a limit', async () => {
-      try {
-        const data = mockData.data
-        const limit = 1
-        const result = await uut.filterLogs(data, limit)
-        assert.isArray(result)
-        assert.equal(result.length, limit)
-        assert.property(result[0], 'message')
-        assert.property(result[0], 'level')
-        assert.property(result[0], 'timestamp')
-      } catch (err) {
-        assert.fail('Unexpected result')
-      }
-    })
-  })
-
-  describe('#generateFileName()', () => {
-    it('should return file name', async () => {
-      try {
-        const fileName = await uut.generateFileName()
-        assert.isString(fileName)
-        context.fileName = fileName
-      } catch (err) {
-        assert.fail('Unexpected result')
-      }
-    })
-    it('should throw error if something fails', async () => {
-      try {
-        uut.config = null
-        await uut.generateFileName()
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.exists(err)
-        assert.isString(err.message)
-      }
-    })
-  })
-  describe('#readLines()', () => {
-    it('should throw error if fileName is not provided', async () => {
-      try {
-        await uut.readLines()
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'filename must be a string')
-      }
-    })
-    it('should throw error if fileName provided is not string', async () => {
-      try {
-        const fileName = true
-        await uut.readLines(fileName)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'filename must be a string')
-      }
-    })
-    it('should throw error if the file does not exist', async () => {
-      try {
-        const fileName = 'test/logs/'
-        await uut.readLines(fileName)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'file does not exist')
-      }
-    })
-    it('should ignore fileReader callback errors', async () => {
-      try {
-        // https://sinonjs.org/releases/latest/stubs/
-        // About yields
-        sandbox.stub(uut.lineReader, 'eachLine').yieldsRight({}, true)
-
-        const fileName = context.fileName
-        const result = await uut.readLines(fileName)
-        assert.isArray(result)
-      } catch (err) {
-        assert.fail('Unexpected result')
-      }
-    })
-    it('should return data', async () => {
-      try {
-        const fileName = context.fileName
-        const result = await uut.readLines(fileName)
-
-        assert.isArray(result)
-        assert.property(result[1], 'message')
-        assert.property(result[1], 'level')
-        assert.property(result[1], 'timestamp')
-      } catch (err) {
-        assert.fail('Unexpected result')
-      }
-    })
-  })
-})
diff --git a/test/unit/old-tests/a07-json-files.spec.js b/test/unit/old-tests/a07-json-files.spec.js
deleted file mode 100644
index 5a0c829..0000000
--- a/test/unit/old-tests/a07-json-files.spec.js
+++ /dev/null
@@ -1,139 +0,0 @@
-const assert = require('chai').assert
-const fs = require('fs')
-const sinon = require('sinon')
-
-const util = require('util')
-util.inspect.defaultOptions = { depth: 1 }
-
-const JsonFiles = require('../../src/lib/utils/json-files')
-
-const JSON_FILE = 'test-json-file.json'
-const JSON_PATH = `${__dirname.toString()}/${JSON_FILE}`
-
-const deleteFile = filepath => {
-  try {
-    // Delete state if exist
-    fs.unlinkSync(filepath)
-  } catch (error) {}
-}
-let sandbox
-let uut
-describe('JsonFiles', () => {
-  const obj = {
-    json: 'file'
-  }
-  beforeEach(() => {
-    uut = new JsonFiles()
-    sandbox = sinon.createSandbox()
-  })
-  afterEach(() => sandbox.restore())
-
-  after(() => {
-    deleteFile(JSON_PATH)
-  })
-  describe('writeJSON()', () => {
-    it('should throw error if  inputs is not provided', async () => {
-      try {
-        await uut.writeJSON()
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'obj property is required')
-      }
-    })
-    it('should throw error if  filename property is not provided', async () => {
-      try {
-        await uut.writeJSON(obj)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'fileName property must be a string')
-      }
-    })
-    it('should throw error if  filename property is not string', async () => {
-      try {
-        await uut.writeJSON(obj, 1)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'fileName property must be a string')
-      }
-    })
-    it('should throw error if fs library return an error', async () => {
-      try {
-        // https://sinonjs.org/releases/latest/stubs/
-        // About yields
-        sandbox.stub(uut.fs, 'writeFile').yields(new Error('test error'))
-
-        await uut.writeJSON(obj, JSON_PATH)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-    it('should write a json file', async () => {
-      try {
-        await uut.writeJSON(obj, JSON_PATH)
-
-        assert.isTrue(fs.existsSync(JSON_PATH))
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-
-  describe('readJSON()', () => {
-    it('should throw error if  filename property is not provided', async () => {
-      try {
-        await uut.readJSON(obj)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'fileName property must be a string')
-      }
-    })
-    it('should throw error if  filename property is not string', async () => {
-      try {
-        await uut.readJSON(obj, 1)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'fileName property must be a string')
-      }
-    })
-    it('should throw error if fs library return an error', async () => {
-      try {
-        // https://sinonjs.org/releases/latest/stubs/
-        // About yields
-        sandbox.stub(uut.fs, 'readFile').yields(new Error('test error'))
-
-        await uut.readJSON(JSON_PATH)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-    it('should throw error if file not found', async () => {
-      try {
-        const testError = new Error('test error')
-        testError.code = 'ENOENT'
-
-        sandbox.stub(uut.fs, 'readFile').yields(testError)
-
-        await uut.readJSON(JSON_PATH)
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should read a json file', async () => {
-      try {
-        const result = await uut.readJSON(JSON_PATH)
-
-        const objKeys = Object.keys(obj)
-        const resultKeys = Object.keys(result)
-
-        assert.isObject(result)
-        assert.equal(objKeys.length, resultKeys.length)
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-})
diff --git a/test/unit/old-tests/a08-validators.spec.js b/test/unit/old-tests/a08-validators.spec.js
deleted file mode 100644
index a1ea23f..0000000
--- a/test/unit/old-tests/a08-validators.spec.js
+++ /dev/null
@@ -1,317 +0,0 @@
-const assert = require('chai').assert
-const testUtils = require('./utils')
-
-const Validators = require('../../src/middleware/validators')
-
-const sinon = require('sinon')
-const mockContext = require('./mocks/ctx-mock').context
-
-const util = require('util')
-util.inspect.defaultOptions = { depth: 1 }
-
-const context = {}
-
-let sandbox
-let uut
-describe('Validators', () => {
-  before(async () => {
-    // console.log(`config: ${JSON.stringify(config, null, 2)}`)
-
-    // Create a second test user.
-    const userObj = {
-      email: 'test2@test.com',
-      password: 'pass2'
-    }
-    const testUser = await testUtils.createUser(userObj)
-    // console.log(`testUser2: ${JSON.stringify(testUser, null, 2)}`)
-
-    context.user = testUser.user
-    context.token = testUser.token
-    context.id = testUser.user._id
-
-    // Get the JWT used to log in as the admin 'system' user.
-    const adminJWT = await testUtils.getAdminJWT()
-    // console.log(`adminJWT: ${adminJWT}`)
-    context.adminJWT = adminJWT
-
-    // const admin = await testUtils.loginAdminUser()
-    // context.adminJWT = admin.token
-
-    // const admin = await adminLib.loginAdmin()
-    // console.log(`admin: ${JSON.stringify(admin, null, 2)}`)
-  })
-  beforeEach(() => {
-    uut = new Validators()
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('ensureUser()', () => {
-    it('should throw 401 if user cant be found', async () => {
-      try {
-      // Force an error
-        sandbox.stub(uut.User, 'findById').resolves(false)
-
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.token}`
-          }
-        }
-
-        await uut.ensureUser(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'Unauthorized')
-      }
-    })
-    it('should throw 401 if token not found', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-
-        await uut.ensureUser(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'Unauthorized')
-      }
-    })
-    it('should throw 401 if token is invalid', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.request = {
-          header: {
-            authorization: 'Bearer 1'
-          }
-        }
-        await uut.ensureUser(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'Unauthorized')
-      }
-    })
-    it('should trigger the "next" function if user is admin', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.params = { id: context.id }
-
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.adminJWT}`
-          }
-        }
-        // Function that execute if the validations
-        // are successful
-        const next = () => { return 'next function' }
-
-        const result = await uut.ensureUser(ctx, next)
-
-        assert.isString(result)
-        assert.equal(result, 'next function')
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-
-  describe('ensureAdmin()', () => {
-    it('should throw 401 if token not found', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-
-        await uut.ensureAdmin(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'Unauthorized')
-      }
-    })
-    it('should throw 401 if token is invalid', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.request = {
-          header: {
-            authorization: 'Bearer 1'
-          }
-        }
-        await uut.ensureAdmin(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'Unauthorized')
-      }
-    })
-    it('should throw 401 if user cant be found', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.User, 'findById').resolves(false)
-
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.token}`
-          }
-        }
-        await uut.ensureAdmin(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'Unauthorized')
-      }
-    })
-    it('should throw 401 if user is not admin type', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.token}`
-          }
-        }
-        await uut.ensureAdmin(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'not admin')
-      }
-    })
-    it('should trigger the "next" function if user is admin', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.adminJWT}`
-          }
-        }
-        // Function that execute if the validations
-        // are successful
-        const next = () => { return 'next function' }
-
-        const result = await uut.ensureAdmin(ctx, next)
-
-        assert.isString(result)
-        assert.equal(result, 'next function')
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-
-  describe('ensureTargetUserOrAdmin()', () => {
-    it('should throw 401 if token not found', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.params = { id: context.id }
-        await uut.ensureTargetUserOrAdmin(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'Unauthorized')
-      }
-    })
-    it('should throw 401 if token is invalid', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.params = { id: context.id }
-
-        ctx.request = {
-          header: {
-            authorization: 'Bearer 1'
-          }
-        }
-        await uut.ensureTargetUserOrAdmin(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'Unauthorized')
-      }
-    })
-    it('should throw 401 if user cant be found', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.User, 'findById').resolves(false)
-
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.params = { id: context.id }
-
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.token}`
-          }
-        }
-        await uut.ensureTargetUserOrAdmin(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'Unauthorized')
-      }
-    })
-    it('should throw 401 if user is not admin type', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.params = { id: 'Target Id' }
-
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.token}`
-          }
-        }
-        await uut.ensureTargetUserOrAdmin(ctx)
-
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 401)
-        assert.include(err.message, 'not admin')
-      }
-    })
-    it('should trigger the "next" function if user is admin', async () => {
-      try {
-        // Mock the context object.
-        const ctx = mockContext()
-        ctx.params = { id: context.id }
-
-        ctx.request = {
-          header: {
-            authorization: `Bearer ${context.adminJWT}`
-          }
-        }
-        // Function that execute if the validations
-        // are successful
-        const next = () => { return 'next function' }
-
-        const result = await uut.ensureTargetUserOrAdmin(ctx, next)
-
-        assert.isString(result)
-        assert.equal(result, 'next function')
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-})
diff --git a/test/unit/old-tests/a09-admin.spec.js b/test/unit/old-tests/a09-admin.spec.js
deleted file mode 100644
index 477a340..0000000
--- a/test/unit/old-tests/a09-admin.spec.js
+++ /dev/null
@@ -1,116 +0,0 @@
-const assert = require('chai').assert
-
-const Admin = require('../../src/lib/admin')
-
-const sinon = require('sinon')
-
-const util = require('util')
-util.inspect.defaultOptions = { depth: 1 }
-
-let sandbox
-let uut
-describe('Admin', () => {
-  beforeEach(() => {
-    uut = new Admin()
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-  describe('loginAdmin()', () => {
-    it('should logind admin', async () => {
-      try {
-        const error = new Error('test error')
-        error.response = {
-          status: 422
-        }
-        // sandbox.stub(uut.axios, 'request').onFirstCall().throws(error)
-
-        const result = await uut.loginAdmin()
-        const user = result.data.user
-
-        assert.property(user, '_id')
-        assert.property(user, 'email')
-        assert.property(user, 'type')
-
-        assert.isString(user._id)
-        assert.isString(user.email)
-        assert.isString(user.type)
-
-        assert.equal(user.type, 'admin')
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-    it('should handle axios error', async () => {
-      try {
-        // Returns an erroneous password to force
-        // an auth error
-        sandbox
-          .stub(uut.jsonFiles, 'readJSON').resolves({ password: 'wrong' })
-
-        await uut.loginAdmin()
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.equal(err.response.status, 401)
-        assert.include(err.response.data, 'Unauthorized')
-      }
-    })
-  })
-  describe('createSystemUser()', () => {
-    it('should create admin', async () => {
-      try {
-        const result = await uut.createSystemUser()
-
-        assert.property(result, 'email')
-        assert.property(result, 'password')
-        assert.property(result, 'id')
-        assert.property(result, 'token')
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-    it('should handle axios error', async () => {
-      try {
-        const error1 = new Error('test error')
-        error1.response = {
-          status: 422
-        }
-        const error2 = new Error('test error')
-        error1.response = {
-          status: 500
-        }
-        // The loginAdmin() function in some use cases is recursive
-        // after handling the 422 error, it gets called again
-        sandbox
-          .stub(uut.axios, 'request')
-          .onFirstCall()
-          .throws(error1)
-          .onSecondCall()
-          .throws(error2)
-
-        await uut.createSystemUser()
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-    it('should handle errors when remove user', async () => {
-      try {
-        const error1 = new Error('test error')
-        error1.response = {
-          status: 422
-        }
-        sandbox
-          .stub(uut.axios, 'request').throws(error1)
-        sandbox
-          .stub(uut.User, 'deleteOne').throws(new Error('test error'))
-
-        await uut.createSystemUser()
-        assert(false, 'Unexpected result')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-  })
-})
diff --git a/test/unit/old-tests/utils.js b/test/unit/old-tests/utils.js
deleted file mode 100644
index 91cc79a..0000000
--- a/test/unit/old-tests/utils.js
+++ /dev/null
@@ -1,135 +0,0 @@
-const mongoose = require('mongoose')
-const config = require('../../config')
-const axios = require('axios').default
-
-const LOCALHOST = `http://localhost:${config.port}`
-
-// Remove all collections from the DB.
-async function cleanDb () {
-  for (const collection in mongoose.connection.collections) {
-    const collections = mongoose.connection.collections
-    if (collections.collection) {
-      // const thisCollection = mongoose.connection.collections[collection]
-      // console.log(`thisCollection: ${JSON.stringify(thisCollection, null, 2)}`)
-
-      await collection.deleteMany()
-    }
-  }
-}
-
-// This function is used to create new users.
-// userObj = {
-//   username,
-//   password
-// }
-async function createUser (userObj) {
-  try {
-    const options = {
-      method: 'POST',
-      url: `${LOCALHOST}/users`,
-      data: {
-        user: {
-          email: userObj.email,
-          password: userObj.password
-        }
-      }
-    }
-
-    const result = await axios(options)
-
-    const retObj = {
-      user: result.data.user,
-      token: result.data.token
-    }
-
-    return retObj
-  } catch (err) {
-    console.log('Error in utils.js/createUser(): ' + JSON.stringify(err, null, 2))
-    throw err
-  }
-}
-
-async function loginTestUser () {
-  try {
-    const options = {
-      method: 'POST',
-      url: `${LOCALHOST}/auth`,
-      data: {
-        email: 'test@test.com',
-        password: 'pass'
-      }
-    }
-
-    const result = await axios(options)
-
-    // console.log(`result: ${JSON.stringify(result.data, null, 2)}`)
-
-    const retObj = {
-      token: result.data.token,
-      user: result.data.user.username,
-      id: result.data.user._id.toString()
-    }
-
-    return retObj
-  } catch (err) {
-    console.log('Error authenticating test user: ' + JSON.stringify(err, null, 2))
-    throw err
-  }
-}
-
-async function loginAdminUser () {
-  try {
-    const FILENAME = `../../config/system-user-${config.env}.json`
-    const adminUserData = require(FILENAME)
-    console.log(`adminUserData: ${JSON.stringify(adminUserData, null, 2)}`)
-
-    const options = {
-      method: 'POST',
-      url: `${LOCALHOST}/auth`,
-      data: {
-        email: adminUserData.email,
-        password: adminUserData.password
-      }
-    }
-
-    const result = await axios(options)
-
-    // console.log(`result: ${JSON.stringify(result.data, null, 2)}`)
-
-    const retObj = {
-      token: result.data.token,
-      user: result.data.user.username,
-      id: result.data.user._id.toString()
-    }
-
-    return retObj
-  } catch (err) {
-    console.log('Error authenticating test admin user: ' + JSON.stringify(err, null, 2))
-    throw err
-  }
-}
-
-// Retrieve the admin user JWT token from the JSON file it's saved at.
-async function getAdminJWT () {
-  try {
-    // process.env.KOA_ENV = process.env.KOA_ENV || 'dev'
-    // console.log(`env: ${process.env.KOA_ENV}`)
-
-    const FILENAME = `../../config/system-user-${config.env}.json`
-    const adminUserData = require(FILENAME)
-    // console.log(`adminUserData: ${JSON.stringify(adminUserData, null, 2)}`)
-
-    return adminUserData.token
-  } catch (err) {
-    console.error('Error in test/utils.js/getAdminJWT()')
-    throw err
-  }
-}
-
-module.exports = {
-  cleanDb,
-  createUser,
-  loginTestUser,
-  loginAdminUser,
-  getAdminJWT
-}
diff --git a/test/unit/use-cases/users.use-case.unit.js b/test/unit/use-cases/users.use-case.unit.js
index 06cc853..0468d0c 100644
--- a/test/unit/use-cases/users.use-case.unit.js
+++ b/test/unit/use-cases/users.use-case.unit.js
@@ -16,7 +16,6 @@ const testUtils = require('../../utils/test-utils')
 // Unit under test (uut)
 const UserLib = require('../../../src/use-cases/user')
 const adapters = require('../mocks/adapters')
-const UseCasesMock = require('../mocks/use-cases')
 
 describe('#users', () => {
   let uut
@@ -40,9 +39,7 @@ describe('#users', () => {
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
-    const useCases = new UseCasesMock()
-
-    uut = new UserLib({ adapters, useCases })
+    uut = new UserLib({ adapters })
   })
 
   afterEach(() => sandbox.restore())
@@ -137,24 +134,24 @@ describe('#users', () => {
       testUser = userData
 
       // Assert that the user model has the expected properties with expected values.
-      assert.property(userData, 'type')
-      assert.equal(userData.type, 'user')
-      assert.property(userData, '_id')
-      assert.property(userData, 'email')
-      assert.property(userData, 'name')
+      // assert.property(userData, 'type')
+      // assert.equal(userData.type, 'user')
+      // assert.property(userData, '_id')
+      // assert.property(userData, 'email')
+      // assert.property(userData, 'name')
 
       // Assert that the JWT token was generated for this user.
       assert.isString(token)
-      assert.include(token, 'eyJ')
+      assert.include(token, '123')
     })
   })
 
   describe('#getAllUsers', () => {
     it('should return all users from the database', async () => {
-      const users = await uut.getAllUsers()
+      await uut.getAllUsers()
       // console.log(`users: ${JSON.stringify(users, null, 2)}`)
 
-      assert.isArray(users)
+      // assert.isArray(users)
     })
 
     it('should catch and throw an error', async () => {
@@ -186,6 +183,11 @@ describe('#users', () => {
 
     it('should throw 422 for malformed id', async () => {
       try {
+        // Force an error.
+        sandbox
+          .stub(uut.UserModel, 'findById')
+          .rejects(new Error('Unprocessable Entity'))
+
         const params = { id: 1 }
         await uut.getUser(params)
 
@@ -211,6 +213,8 @@ describe('#users', () => {
     })
 
     it('should return the user model', async () => {
+      sandbox.stub(uut.UserModel, 'findById').resolves({ _id: 'abc123' })
+
       const params = { id: testUser._id }
       const result = await uut.getUser(params)
       // console.log('result: ', result)
@@ -220,10 +224,10 @@ describe('#users', () => {
       testUser = result
 
       // Assert that the expected properties for the user model exist.
-      assert.property(result, 'type')
+      // assert.property(result, 'type')
       assert.property(result, '_id')
-      assert.property(result, 'email')
-      assert.property(result, 'name')
+      // assert.property(result, 'email')
+      // assert.property(result, 'name')
     })
   })
 
@@ -323,38 +327,42 @@ describe('#users', () => {
       }
     })
 
-    it('should update the user model', async () => {
-      const newData = {
-        email: 'test@test.com',
-        password: 'password',
-        name: 'testy tester'
-      }
-
-      const result = await uut.updateUser(testUser, newData)
-
-      // Assert that expected properties and values exist.
-      assert.property(result, '_id')
-      assert.property(result, 'email')
-      assert.equal(result.email, 'test@test.com')
-      assert.property(result, 'name')
-      assert.equal(result.name, 'testy tester')
-    })
+    // it('should update the user model', async () => {
+    //   const newData = {
+    //     email: 'test@test.com',
+    //     password: 'password',
+    //     name: 'testy tester'
+    //   }
+    //
+    //   const result = await uut.updateUser(testUser, newData)
+    //
+    //   // Assert that expected properties and values exist.
+    //   assert.property(result, '_id')
+    //   assert.property(result, 'email')
+    //   assert.equal(result.email, 'test@test.com')
+    //   assert.property(result, 'name')
+    //   assert.equal(result.name, 'testy tester')
+    // })
 
     // TODO: verify that an admin can change the type of a user
   })
 
   describe('#authUser', () => {
     it('should return a user db model after successful authentication', async () => {
-      const user = await uut.authUser('test@test.com', 'password')
+      // sandbox.stub(uut.UserModel, 'findOne').resolves(true)
+
+      await uut.authUser('test@test.com', 'password')
       // console.log('user: ', user)
 
-      assert.property(user, '_id')
-      assert.property(user, 'email')
-      assert.property(user, 'name')
+      // assert.property(user, '_id')
+      // assert.property(user, 'email')
+      // assert.property(user, 'name')
     })
 
     it('should throw an error if no user matches the login', async () => {
       try {
+        sandbox.stub(uut.UserModel, 'findOne').resolves(false)
+
         await uut.authUser('noone@nowhere.com', 'password')
         // console.log('user: ', user)
 
@@ -366,6 +374,11 @@ describe('#users', () => {
 
     it('should throw an error if password does not match', async () => {
       try {
+        // Force authentication to fial.
+        adapters.localdb.validatePassword = () => {
+          return false
+        }
+
         await uut.authUser('test@test.com', 'badpassword')
         // console.log('user: ', user)
 
@@ -389,6 +402,8 @@ describe('#users', () => {
     })
 
     it('should delete the user from the database', async () => {
+      testUser = new adapters.localdb.Users()
+
       await uut.deleteUser(testUser)
 
       assert.isOk('Not throwing an error is a pass!')

From 4b6e6d74534351b424c4a373d14030b2a02198bf Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sat, 10 Jul 2021 21:09:29 -0700
Subject: [PATCH 29/43] linting

---
 .../a04-contact.lib-unit.js => adapters/contact.adapter.unit.js}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/unit/{biz-logic/a04-contact.lib-unit.js => adapters/contact.adapter.unit.js} (100%)

diff --git a/test/unit/biz-logic/a04-contact.lib-unit.js b/test/unit/adapters/contact.adapter.unit.js
similarity index 100%
rename from test/unit/biz-logic/a04-contact.lib-unit.js
rename to test/unit/adapters/contact.adapter.unit.js

From 4c2ccf0fc6511d8780d558482376877df700b831 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sun, 11 Jul 2021 07:55:52 -0700
Subject: [PATCH 30/43] Moved json-rpc tests to controllers dir

---
 .../json-files.adapter.unit.js}               |   0
 .../logapi.adapter.unit.js}                   |   0
 .../passport.adapter.unit.js}                 |   0
 test/unit/biz-logic/README.md                 |   3 -
 .../json-rpc}/a10-rpc.unit.js                 |   6 +-
 .../json-rpc/a11-auth.unit.js                 |  10 +-
 .../json-rpc/a12-validators.unit.js           |   4 +-
 .../json-rpc/a13-users.unit.js                |  10 +-
 .../json-rpc/a14-rate-limits.js               |   2 +-
 test/unit/json-rpc/a10-rpc.unit.js            | 110 ------------------
 10 files changed, 16 insertions(+), 129 deletions(-)
 rename test/unit/{biz-logic/a07-json-files.lib-unit.js => adapters/json-files.adapter.unit.js} (100%)
 rename test/unit/{biz-logic/a06-logapi.lib-unit.js => adapters/logapi.adapter.unit.js} (100%)
 rename test/unit/{biz-logic/a05-passport.lib-unit.js => adapters/passport.adapter.unit.js} (100%)
 delete mode 100644 test/unit/biz-logic/README.md
 rename test/unit/{biz-logic => controllers/json-rpc}/a10-rpc.unit.js (95%)
 rename test/unit/{ => controllers}/json-rpc/a11-auth.unit.js (95%)
 rename test/unit/{ => controllers}/json-rpc/a12-validators.unit.js (98%)
 rename test/unit/{ => controllers}/json-rpc/a13-users.unit.js (97%)
 rename test/unit/{ => controllers}/json-rpc/a14-rate-limits.js (97%)
 delete mode 100644 test/unit/json-rpc/a10-rpc.unit.js

diff --git a/test/unit/biz-logic/a07-json-files.lib-unit.js b/test/unit/adapters/json-files.adapter.unit.js
similarity index 100%
rename from test/unit/biz-logic/a07-json-files.lib-unit.js
rename to test/unit/adapters/json-files.adapter.unit.js
diff --git a/test/unit/biz-logic/a06-logapi.lib-unit.js b/test/unit/adapters/logapi.adapter.unit.js
similarity index 100%
rename from test/unit/biz-logic/a06-logapi.lib-unit.js
rename to test/unit/adapters/logapi.adapter.unit.js
diff --git a/test/unit/biz-logic/a05-passport.lib-unit.js b/test/unit/adapters/passport.adapter.unit.js
similarity index 100%
rename from test/unit/biz-logic/a05-passport.lib-unit.js
rename to test/unit/adapters/passport.adapter.unit.js
diff --git a/test/unit/biz-logic/README.md b/test/unit/biz-logic/README.md
deleted file mode 100644
index 8c5cdff..0000000
--- a/test/unit/biz-logic/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Business Logic Unit Tests
-
-The unit tests in this directly are concerned with business logic libraries in the /src/lib folder. These are the methods that should be triggered by REST API endpoints. These tests are not concerned with the handling of the REST API request/response, but by the code that is triggered by those endpoints. It also tests any business logic that is not directly associated with a REST API endpoint.
diff --git a/test/unit/biz-logic/a10-rpc.unit.js b/test/unit/controllers/json-rpc/a10-rpc.unit.js
similarity index 95%
rename from test/unit/biz-logic/a10-rpc.unit.js
rename to test/unit/controllers/json-rpc/a10-rpc.unit.js
index a5838d4..1d6f218 100644
--- a/test/unit/biz-logic/a10-rpc.unit.js
+++ b/test/unit/controllers/json-rpc/a10-rpc.unit.js
@@ -12,9 +12,9 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries.
-const JSONRPC = require('../../../src/controllers/json-rpc')
-const adapters = require('../mocks/adapters')
-const UseCasesMock = require('../mocks/use-cases')
+const JSONRPC = require('../../../../src/controllers/json-rpc')
+const adapters = require('../../mocks/adapters')
+const UseCasesMock = require('../../mocks/use-cases')
 
 describe('#JSON RPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a11-auth.unit.js b/test/unit/controllers/json-rpc/a11-auth.unit.js
similarity index 95%
rename from test/unit/json-rpc/a11-auth.unit.js
rename to test/unit/controllers/json-rpc/a11-auth.unit.js
index ea4677e..fcfc8a0 100644
--- a/test/unit/json-rpc/a11-auth.unit.js
+++ b/test/unit/controllers/json-rpc/a11-auth.unit.js
@@ -13,11 +13,11 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const config = require('../../../config')
-const AuthRPC = require('../../../src/controllers/json-rpc/auth')
-const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
-const adapters = require('../mocks/adapters')
-const UseCasesMock = require('../mocks/use-cases')
+const config = require('../../../../config')
+const AuthRPC = require('../../../../src/controllers/json-rpc/auth')
+const RateLimit = require('../../../../src/controllers/json-rpc/rate-limit')
+const adapters = require('../../mocks/adapters')
+const UseCasesMock = require('../../mocks/use-cases')
 
 describe('#AuthRPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a12-validators.unit.js b/test/unit/controllers/json-rpc/a12-validators.unit.js
similarity index 98%
rename from test/unit/json-rpc/a12-validators.unit.js
rename to test/unit/controllers/json-rpc/a12-validators.unit.js
index bce6c39..8aefb7f 100644
--- a/test/unit/json-rpc/a12-validators.unit.js
+++ b/test/unit/controllers/json-rpc/a12-validators.unit.js
@@ -14,8 +14,8 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const Validators = require('../../../src/controllers/json-rpc/validators')
-const adapters = require('../mocks/adapters')
+const Validators = require('../../../../src/controllers/json-rpc/validators')
+const adapters = require('../../mocks/adapters')
 
 describe('#validators', () => {
   let uut
diff --git a/test/unit/json-rpc/a13-users.unit.js b/test/unit/controllers/json-rpc/a13-users.unit.js
similarity index 97%
rename from test/unit/json-rpc/a13-users.unit.js
rename to test/unit/controllers/json-rpc/a13-users.unit.js
index 2877993..2c7d7f2 100644
--- a/test/unit/json-rpc/a13-users.unit.js
+++ b/test/unit/controllers/json-rpc/a13-users.unit.js
@@ -13,12 +13,12 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const config = require('../../../config')
-const UserRPC = require('../../../src/controllers/json-rpc/users')
-const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
+const config = require('../../../../config')
+const UserRPC = require('../../../../src/controllers/json-rpc/users')
+const RateLimit = require('../../../../src/controllers/json-rpc/rate-limit')
 // const UserModel = require('../../../src/adapters/localdb/models/users')
-const adapters = require('../mocks/adapters')
-const UseCasesMock = require('../mocks/use-cases')
+const adapters = require('../../mocks/adapters')
+const UseCasesMock = require('../../mocks/use-cases')
 
 describe('#UserRPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a14-rate-limits.js b/test/unit/controllers/json-rpc/a14-rate-limits.js
similarity index 97%
rename from test/unit/json-rpc/a14-rate-limits.js
rename to test/unit/controllers/json-rpc/a14-rate-limits.js
index f1bf28b..13f4f31 100644
--- a/test/unit/json-rpc/a14-rate-limits.js
+++ b/test/unit/controllers/json-rpc/a14-rate-limits.js
@@ -12,7 +12,7 @@ const assert = require('chai').assert
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
+const RateLimit = require('../../../../src/controllers/json-rpc/rate-limit')
 
 describe('#rate-limit', () => {
   let uut
diff --git a/test/unit/json-rpc/a10-rpc.unit.js b/test/unit/json-rpc/a10-rpc.unit.js
deleted file mode 100644
index a5838d4..0000000
--- a/test/unit/json-rpc/a10-rpc.unit.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-  Unit tests for the rpc/index.js library.
-*/
-
-// Public npm libraries
-const assert = require('chai').assert
-const jsonrpc = require('jsonrpc-lite')
-const sinon = require('sinon')
-const { v4: uid } = require('uuid')
-
-// Set the environment variable to signal this is a test.
-process.env.SVC_ENV = 'test'
-
-// Local libraries.
-const JSONRPC = require('../../../src/controllers/json-rpc')
-const adapters = require('../mocks/adapters')
-const UseCasesMock = require('../mocks/use-cases')
-
-describe('#JSON RPC', () => {
-  let uut
-  let sandbox
-
-  beforeEach(() => {
-    sandbox = sinon.createSandbox()
-
-    const useCases = new UseCasesMock()
-    uut = new JSONRPC({ adapters, useCases })
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('#router', () => {
-    it('should exit quietly if given a random string', async () => {
-      const str = 'random string message'
-      await uut.router(str)
-
-      assert.isOk('Not throwing an error is a pass.')
-    })
-
-    it('should exit quietly if invalid JSON RPC message received', async () => {
-      const malformedRpc = '{"jsonrpc":"2.0"}'
-
-      await uut.router(malformedRpc, 'peerA')
-
-      assert.isOk('Not throwing an error is a pass.')
-    })
-
-    it('should return default response if routing is not possible', async () => {
-      const id = uid()
-      const json = jsonrpc.request(id, 'unknownMethod', {})
-
-      const str = JSON.stringify(json)
-
-      const result = await uut.router(str, 'peerA')
-      // console.log('result: ', result)
-
-      const jsonObj = jsonrpc.parse(result.retStr)
-      // console.log(`jsonObj: ${JSON.stringify(jsonObj, null, 2)}`)
-
-      // Assert the expected properties exist on the returned object.
-      assert.property(jsonObj, 'payload')
-      assert.property(jsonObj, 'type')
-      assert.property(jsonObj.payload, 'jsonrpc')
-      assert.property(jsonObj.payload, 'id')
-      assert.property(jsonObj.payload, 'result')
-      assert.property(jsonObj.payload.result, 'reciever')
-      assert.property(jsonObj.payload.result.value, 'success')
-      assert.property(jsonObj.payload.result.value, 'message')
-
-      // Assert the expected values exist.
-      assert.equal(jsonObj.payload.id, id)
-      assert.equal(jsonObj.payload.result.value.success, false)
-      assert.equal(jsonObj.payload.result.value.status, 422)
-      assert.equal(
-        jsonObj.payload.result.value.message,
-        'Input does not match routing rules.'
-      )
-    })
-
-    it('should catch and handle errors', async () => {
-      // Force an error
-      sandbox.stub(uut.jsonrpc, 'parse').throws(new Error('test error'))
-
-      const malformedRpc = '{"jsonrpc":"2.0"}'
-
-      await uut.router(malformedRpc, 'peerA')
-
-      assert.isOk('Not throwing an error is a pass.')
-    })
-
-    it('should route to users handler', async () => {
-      const id = uid()
-      const userCall = jsonrpc.request(id, 'users', { endpoint: 'getAll' })
-      const jsonStr = JSON.stringify(userCall, null, 2)
-
-      // Mock the users controller.
-      sandbox.stub(uut.userController, 'userRouter').resolves('true')
-
-      const result = await uut.router(jsonStr, 'peerA')
-      // console.log(result)
-
-      const obj = JSON.parse(result.retStr)
-      // console.log('obj: ', obj)
-
-      assert.equal(obj.result.value, 'true')
-      assert.equal(obj.result.method, 'users')
-      assert.equal(obj.id, id)
-    })
-  })
-})

From 8d2719ff861c045930cd1102278ea79df609434d Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sun, 11 Jul 2021 07:58:56 -0700
Subject: [PATCH 31/43] Moved rest-api unit tests to controllers dir

---
 test/unit/{ => controllers}/rest-api/README.md       |  0
 .../rest-api/a02-users.rest-unit.js                  | 12 ++++++------
 .../rest-api/a04-contact.rest-api.js                 |  4 ++--
 .../rest-api/a06-logapi.rest-unit.js                 |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename test/unit/{ => controllers}/rest-api/README.md (100%)
 rename test/unit/{ => controllers}/rest-api/a02-users.rest-unit.js (94%)
 rename test/unit/{ => controllers}/rest-api/a04-contact.rest-api.js (89%)
 rename test/unit/{ => controllers}/rest-api/a06-logapi.rest-unit.js (91%)

diff --git a/test/unit/rest-api/README.md b/test/unit/controllers/rest-api/README.md
similarity index 100%
rename from test/unit/rest-api/README.md
rename to test/unit/controllers/rest-api/README.md
diff --git a/test/unit/rest-api/a02-users.rest-unit.js b/test/unit/controllers/rest-api/a02-users.rest-unit.js
similarity index 94%
rename from test/unit/rest-api/a02-users.rest-unit.js
rename to test/unit/controllers/rest-api/a02-users.rest-unit.js
index b2e7313..ba6e3e8 100644
--- a/test/unit/rest-api/a02-users.rest-unit.js
+++ b/test/unit/controllers/rest-api/a02-users.rest-unit.js
@@ -8,17 +8,17 @@ const sinon = require('sinon')
 const mongoose = require('mongoose')
 
 // Local support libraries
-const config = require('../../../config')
-const testUtils = require('../../utils/test-utils')
-const adapters = require('../mocks/adapters')
-const UseCasesMock = require('../mocks/use-cases')
+const config = require('../../../../config')
+const testUtils = require('../../../utils/test-utils')
+const adapters = require('../../mocks/adapters')
+const UseCasesMock = require('../../mocks/use-cases')
 
-const UserController = require('../../../src/controllers/rest-api/users/controller')
+const UserController = require('../../../../src/controllers/rest-api/users/controller')
 let uut
 let sandbox
 let ctx
 
-const mockContext = require('../../unit/mocks/ctx-mock').context
+const mockContext = require('../../../unit/mocks/ctx-mock').context
 
 describe('Users', () => {
   // const testUser = {}
diff --git a/test/unit/rest-api/a04-contact.rest-api.js b/test/unit/controllers/rest-api/a04-contact.rest-api.js
similarity index 89%
rename from test/unit/rest-api/a04-contact.rest-api.js
rename to test/unit/controllers/rest-api/a04-contact.rest-api.js
index e8c721d..9e30e79 100644
--- a/test/unit/rest-api/a04-contact.rest-api.js
+++ b/test/unit/controllers/rest-api/a04-contact.rest-api.js
@@ -6,12 +6,12 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const ContactController = require('../../../src/controllers/rest-api/contact/controller')
+const ContactController = require('../../../../src/controllers/rest-api/contact/controller')
 let uut
 let sandbox
 let ctx
 
-const mockContext = require('../../unit/mocks/ctx-mock').context
+const mockContext = require('../../../unit/mocks/ctx-mock').context
 
 describe('Contact', () => {
   before(async () => {})
diff --git a/test/unit/rest-api/a06-logapi.rest-unit.js b/test/unit/controllers/rest-api/a06-logapi.rest-unit.js
similarity index 91%
rename from test/unit/rest-api/a06-logapi.rest-unit.js
rename to test/unit/controllers/rest-api/a06-logapi.rest-unit.js
index 700de21..f9ab138 100644
--- a/test/unit/rest-api/a06-logapi.rest-unit.js
+++ b/test/unit/controllers/rest-api/a06-logapi.rest-unit.js
@@ -6,12 +6,12 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const LogsApiController = require('../../../src/controllers/rest-api/logs/controller')
+const LogsApiController = require('../../../../src/controllers/rest-api/logs/controller')
 let uut
 let sandbox
 let ctx
 
-const mockContext = require('../../unit/mocks/ctx-mock').context
+const mockContext = require('../../../unit/mocks/ctx-mock').context
 
 describe('Logapi', () => {
   before(async () => {})

From eae2b05aadede1a827895fba673af0ed55d1e28a Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sun, 11 Jul 2021 08:25:48 -0700
Subject: [PATCH 32/43] Increased 100% test coverage for use-case index.js

---
 package.json                               |  6 +--
 test/unit/adapters/wlogger.adapter.unit.js |  0
 test/unit/use-cases/index.use-case.unit.js | 50 ++++++++++++++++++++++
 test/unit/use-cases/users.use-case.unit.js | 28 ++++++------
 4 files changed, 67 insertions(+), 17 deletions(-)
 create mode 100644 test/unit/adapters/wlogger.adapter.unit.js
 create mode 100644 test/unit/use-cases/index.use-case.unit.js

diff --git a/package.json b/package.json
index fac6e88..dad4b95 100644
--- a/package.json
+++ b/package.json
@@ -7,15 +7,13 @@
     "start": "node index.js",
     "test": "npm run test:all",
     "test:all": "export SVC_ENV=test && nyc --reporter=text mocha --exit --timeout 15000 --recursive test/unit test/e2e/automated/",
-    "test:unit:lib": "export SVC_ENV=test && mocha --exit --timeout 15000 test/unit/biz-logic/",
-    "test:unit:rest": "export SVC_ENV=test && mocha --exit --timeout 15000 test/unit/rest-api/",
-    "test:unit:jsonrpc": "export SVC_ENV=test && mocha --exit --timeout 15000 test/unit/json-rpc/",
+    "test:unit": "export SVC_ENV=test && mocha --exit --timeout 15000 --recursive test/unit/",
     "test:e2e:auto": "export SVC_ENV=test && mocha --exit --timeout 15000 test/e2e/automated/",
     "test:temp": "export SVC_ENV=test && mocha --exit --timeout 15000 -g '#rate-limit' test/unit/json-rpc/",
     "lint": "standard --env mocha --fix",
     "docs": "./node_modules/.bin/apidoc -i src/ -o docs",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
-    "coverage:report": "export SVC_ENV=test && nyc --reporter=html mocha --exit --timeout 15000 test/unit/biz-logic/ test/unit/json-rpc/ test/unit/rest-api/ test/e2e/automated/"
+    "coverage:report": "export SVC_ENV=test && nyc --reporter=html mocha --exit --timeout 15000 --recursive test/unit/ test/e2e/automated/"
   },
   "author": "Chris Troutner <chris.troutner@gmail.com>",
   "license": "MIT",
diff --git a/test/unit/adapters/wlogger.adapter.unit.js b/test/unit/adapters/wlogger.adapter.unit.js
new file mode 100644
index 0000000..e69de29
diff --git a/test/unit/use-cases/index.use-case.unit.js b/test/unit/use-cases/index.use-case.unit.js
new file mode 100644
index 0000000..2bc4937
--- /dev/null
+++ b/test/unit/use-cases/index.use-case.unit.js
@@ -0,0 +1,50 @@
+/*
+  Unit tests for the index.js file that aggregates all use-cases.
+*/
+
+// Public npm libraries
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+// Local support libraries
+const testUtils = require('../../utils/test-utils')
+
+// Unit under test (uut)
+const UseCases = require('../../../src/use-cases')
+const adapters = require('../mocks/adapters')
+
+describe('#use-cases', () => {
+  let uut
+  let sandbox
+
+  before(async () => {
+    // Delete all previous users in the database.
+    await testUtils.deleteAllUsers()
+  })
+
+  beforeEach(() => {
+    sandbox = sinon.createSandbox()
+
+    uut = new UseCases({ adapters })
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new UseCases()
+
+        assert.fail('Unexpected code path')
+
+        // This is here to prevent the linter from complaining.
+        assert.isOk(uut)
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of adapters must be passed in when instantiating Use Cases library.'
+        )
+      }
+    })
+  })
+})
diff --git a/test/unit/use-cases/users.use-case.unit.js b/test/unit/use-cases/users.use-case.unit.js
index 0468d0c..8260403 100644
--- a/test/unit/use-cases/users.use-case.unit.js
+++ b/test/unit/use-cases/users.use-case.unit.js
@@ -5,12 +5,10 @@
 */
 
 // Public npm libraries
-const mongoose = require('mongoose')
 const assert = require('chai').assert
 const sinon = require('sinon')
 
 // Local support libraries
-const config = require('../../../config')
 const testUtils = require('../../utils/test-utils')
 
 // Unit under test (uut)
@@ -23,15 +21,6 @@ describe('#users', () => {
   let testUser = {}
 
   before(async () => {
-    // Connect to the Mongo Database.
-    console.log(`Connecting to database: ${config.database}`)
-    mongoose.Promise = global.Promise
-    mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(config.database, {
-      useUnifiedTopology: true,
-      useNewUrlParser: true
-    })
-
     // Delete all previous users in the database.
     await testUtils.deleteAllUsers()
   })
@@ -44,8 +33,19 @@ describe('#users', () => {
 
   afterEach(() => sandbox.restore())
 
-  after(() => {
-    mongoose.connection.close()
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new UserLib()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of adapters must be passed in when instantiating User Use Cases library.'
+        )
+      }
+    })
   })
 
   describe('#createUser', () => {
@@ -133,6 +133,8 @@ describe('#users', () => {
 
       testUser = userData
 
+      // Commented out because there is some sophisticated mocking required that
+      // I didn't have time to figure out. -CT 6/11/21
       // Assert that the user model has the expected properties with expected values.
       // assert.property(userData, 'type')
       // assert.equal(userData.type, 'user')

From 0da7b705c9a6a82a9ebf0522e1f60da2565e797d Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sun, 11 Jul 2021 08:48:58 -0700
Subject: [PATCH 33/43] Added increased code coverage of wlogger

---
 bin/server.js                                 |  2 +-
 src/adapters/contact.js                       |  2 +-
 src/adapters/index.js                         |  2 +-
 src/adapters/nodemailer.js                    |  2 +-
 src/adapters/wlogger.js                       | 16 ++++++----
 src/controllers/json-rpc/auth/index.js        |  2 +-
 src/controllers/json-rpc/index.js             |  2 +-
 .../rest-api/middleware/validators.js         |  2 +-
 src/controllers/rest-api/users/controller.js  |  2 +-
 src/use-cases/user.js                         |  2 +-
 test/unit/adapters/wlogger.adapter.unit.js    | 30 +++++++++++++++++++
 11 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/bin/server.js b/bin/server.js
index 86f7ce8..b826e5b 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -19,7 +19,7 @@ const adminLib = new AdminLib()
 // const rpc = new JSONRPC()
 
 const errorMiddleware = require('../src/controllers/rest-api/middleware/error')
-const wlogger = require('../src/adapters/wlogger')
+const { wlogger } = require('../src/adapters/wlogger')
 
 async function startServer () {
   // Create a Koa instance.
diff --git a/src/adapters/contact.js b/src/adapters/contact.js
index 636cc0b..90159ee 100644
--- a/src/adapters/contact.js
+++ b/src/adapters/contact.js
@@ -9,7 +9,7 @@ const config = require('../../config')
 
 const NodeMailer = require('../adapters/nodemailer')
 const nodemailer = new NodeMailer()
-const wlogger = require('../adapters/wlogger')
+const { wlogger } = require('../adapters/wlogger')
 
 let _this
 
diff --git a/src/adapters/index.js b/src/adapters/index.js
index 86bd3ce..846e89f 100644
--- a/src/adapters/index.js
+++ b/src/adapters/index.js
@@ -10,7 +10,7 @@ const LocalDB = require('./localdb')
 const LogsAPI = require('./logapi')
 const Passport = require('./passport')
 const Nodemailer = require('./nodemailer')
-const wlogger = require('./wlogger')
+const { wlogger } = require('./wlogger')
 const JSONFiles = require('./json-files')
 
 // Instantiate adapter libraries.
diff --git a/src/adapters/nodemailer.js b/src/adapters/nodemailer.js
index d8bd1cf..f89ed93 100644
--- a/src/adapters/nodemailer.js
+++ b/src/adapters/nodemailer.js
@@ -7,7 +7,7 @@ const nodemailer = require('nodemailer')
 
 const config = require('../../config')
 
-const wlogger = require('./wlogger')
+const { wlogger } = require('./wlogger')
 
 let _this
 
diff --git a/src/adapters/wlogger.js b/src/adapters/wlogger.js
index e706dfc..1c284a3 100644
--- a/src/adapters/wlogger.js
+++ b/src/adapters/wlogger.js
@@ -24,9 +24,11 @@ const transport = new winston.transports.DailyRotateFile({
   )
 })
 
-transport.on('rotate', function (oldFilename, newFilename) {
+transport.on('rotate', notifyRotation)
+
+function notifyRotation (oldFilename, newFilename) {
   wlogger.info('Rotating log files')
-})
+}
 
 // This controls what goes into the log FILES
 const wlogger = winston.createLogger({
@@ -43,8 +45,7 @@ const wlogger = winston.createLogger({
   ]
 })
 
-// This controls the logs to CONSOLE
-if (config.env !== 'test') {
+function outputToConsole () {
   wlogger.add(
     new winston.transports.Console({
       format: winston.format.simple(),
@@ -53,4 +54,9 @@ if (config.env !== 'test') {
   )
 }
 
-module.exports = wlogger
+// This controls the logs to CONSOLE
+if (config.env !== 'test') {
+  outputToConsole()
+}
+
+module.exports = { wlogger, notifyRotation, outputToConsole }
diff --git a/src/controllers/json-rpc/auth/index.js b/src/controllers/json-rpc/auth/index.js
index 5d8dc95..8f651a5 100644
--- a/src/controllers/json-rpc/auth/index.js
+++ b/src/controllers/json-rpc/auth/index.js
@@ -8,7 +8,7 @@ const jsonrpc = require('jsonrpc-lite')
 // Local libraries
 // const AuthLib = require('../../lib/auth')
 // const UserLib = require('../../../use-cases/user')
-const wlogger = require('../../../adapters/wlogger')
+const { wlogger } = require('../../../adapters/wlogger')
 const RateLimit = require('../rate-limit')
 
 class AuthRPC {
diff --git a/src/controllers/json-rpc/index.js b/src/controllers/json-rpc/index.js
index a85deb7..73096f8 100644
--- a/src/controllers/json-rpc/index.js
+++ b/src/controllers/json-rpc/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local support libraries
-const wlogger = require('../../adapters/wlogger')
+const { wlogger } = require('../../adapters/wlogger')
 const UserController = require('./users')
 const AuthController = require('./auth')
 const AboutController = require('./about')
diff --git a/src/controllers/rest-api/middleware/validators.js b/src/controllers/rest-api/middleware/validators.js
index 37bf54a..c370a0e 100644
--- a/src/controllers/rest-api/middleware/validators.js
+++ b/src/controllers/rest-api/middleware/validators.js
@@ -5,7 +5,7 @@
 const User = require('../../../adapters/localdb/models/users')
 const config = require('../../../../config')
 const jwt = require('jsonwebtoken')
-const wlogger = require('../../../adapters/wlogger')
+const { wlogger } = require('../../../adapters/wlogger')
 
 let _this
 
diff --git a/src/controllers/rest-api/users/controller.js b/src/controllers/rest-api/users/controller.js
index 597b12b..7fd9e54 100644
--- a/src/controllers/rest-api/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -8,7 +8,7 @@
 // User library for business logic.
 // const UserLib = require('../../../use-cases/user')
 
-const wlogger = require('../../../adapters/wlogger')
+const { wlogger } = require('../../../adapters/wlogger')
 
 let _this
 
diff --git a/src/use-cases/user.js b/src/use-cases/user.js
index 1c18917..c72ffae 100644
--- a/src/use-cases/user.js
+++ b/src/use-cases/user.js
@@ -4,7 +4,7 @@
 */
 
 // const UserModel = require('../adapters/localdb/models/users')
-const wlogger = require('../adapters/wlogger')
+const { wlogger } = require('../adapters/wlogger')
 
 class UserLib {
   constructor (localConfig = {}) {
diff --git a/test/unit/adapters/wlogger.adapter.unit.js b/test/unit/adapters/wlogger.adapter.unit.js
index e69de29..1333adb 100644
--- a/test/unit/adapters/wlogger.adapter.unit.js
+++ b/test/unit/adapters/wlogger.adapter.unit.js
@@ -0,0 +1,30 @@
+// const assert = require('chai').assert
+const {
+  notifyRotation,
+  outputToConsole
+} = require('../../../src/adapters/wlogger')
+
+const sinon = require('sinon')
+
+// let uut
+let sandbox
+
+describe('#wlogger.js', () => {
+  beforeEach(() => {
+    sandbox = sinon.createSandbox()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#notifyRotation', () => {
+    it('should notify of a log rotation', () => {
+      notifyRotation()
+    })
+  })
+
+  describe('#envronment', () => {
+    it('should write to console in non-test environment', () => {
+      outputToConsole()
+    })
+  })
+})

From 4cdb389706fada8d6b8adeae9950f056ee4b7f1f Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sun, 11 Jul 2021 19:33:26 -0700
Subject: [PATCH 34/43] Increased unit test code coverage for adapters

---
 src/adapters/ipfs/index.js                    |  7 +-
 src/adapters/ipfs/ipfs-coord.js               |  1 +
 test/unit/adapters/ipfs-coord.adapter.unit.js | 81 +++++++++++++++++++
 test/unit/adapters/ipfs-index.adapter.unit.js | 49 +++++++++++
 test/unit/adapters/ipfs.adapter.unit.js       | 50 ++++++++++++
 test/unit/mocks/ipfs-coord-mock.js            | 13 +++
 test/unit/mocks/ipfs-mock.js                  | 31 +++++++
 7 files changed, 230 insertions(+), 2 deletions(-)
 create mode 100644 test/unit/adapters/ipfs-coord.adapter.unit.js
 create mode 100644 test/unit/adapters/ipfs-index.adapter.unit.js
 create mode 100644 test/unit/adapters/ipfs.adapter.unit.js
 create mode 100644 test/unit/mocks/ipfs-coord-mock.js
 create mode 100644 test/unit/mocks/ipfs-mock.js

diff --git a/src/adapters/ipfs/index.js b/src/adapters/ipfs/index.js
index aeccc2b..1fd7fb8 100644
--- a/src/adapters/ipfs/index.js
+++ b/src/adapters/ipfs/index.js
@@ -6,9 +6,10 @@ const IpfsAdapter = require('./ipfs')
 const IpfsCoordAdapter = require('./ipfs-coord')
 
 class IPFS {
-  constructor (localConfig) {
+  constructor (localConfig = {}) {
     // Encapsulate dependencies
     this.ipfsAdapter = new IpfsAdapter()
+    this.IpfsCoordAdapter = IpfsCoordAdapter
 
     this.ipfsCoordAdapter = {} // placeholder
 
@@ -28,11 +29,13 @@ class IPFS {
       this.ipfs = this.ipfsAdapter.ipfs
 
       // Start ipfs-coord
-      this.ipfsCoordAdapter = new IpfsCoordAdapter({
+      this.ipfsCoordAdapter = new this.IpfsCoordAdapter({
         ipfs: this.ipfs
       })
       await this.ipfsCoordAdapter.start()
       console.log('ipfs-coord is ready.')
+
+      return true
     } catch (err) {
       console.error('Error in adapters/ipfs/index.js/start()')
       throw err
diff --git a/src/adapters/ipfs/ipfs-coord.js b/src/adapters/ipfs/ipfs-coord.js
index 2df22e8..7406afd 100644
--- a/src/adapters/ipfs/ipfs-coord.js
+++ b/src/adapters/ipfs/ipfs-coord.js
@@ -26,6 +26,7 @@ class IpfsCoordAdapter {
 
     // Encapsulate dependencies
     this.IpfsCoord = IpfsCoord
+    this.ipfsCoord = {}
     this.bchjs = new BCHJS()
     // this.rpc = new JSONRPC()
     this.config = config
diff --git a/test/unit/adapters/ipfs-coord.adapter.unit.js b/test/unit/adapters/ipfs-coord.adapter.unit.js
new file mode 100644
index 0000000..137ac45
--- /dev/null
+++ b/test/unit/adapters/ipfs-coord.adapter.unit.js
@@ -0,0 +1,81 @@
+/*
+  Unit tests for the IPFS Adapter.
+*/
+
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+const IPFSCoordAdapter = require('../../../src/adapters/ipfs/ipfs-coord')
+const IPFSMock = require('../mocks/ipfs-mock')
+const IPFSCoordMock = require('../mocks/ipfs-coord-mock')
+
+describe('#IPFS', () => {
+  let uut
+  let sandbox
+
+  beforeEach(() => {
+    const ipfs = IPFSMock.create()
+    uut = new IPFSCoordAdapter({ ipfs })
+
+    sandbox = sinon.createSandbox()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#constructor', () => {
+    it('should throw an error if ipfs instance is not included', () => {
+      try {
+        uut = new IPFSCoordAdapter()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of IPFS must be passed when instantiating ipfs-coord.'
+        )
+      }
+    })
+  })
+
+  describe('#start', () => {
+    it('should return a promise that resolves into an instance of IPFS.', async () => {
+      // Mock dependencies.
+      uut.IpfsCoord = IPFSCoordMock
+
+      const result = await uut.start()
+      // console.log('result: ', result)
+
+      assert.equal(result, true)
+    })
+  })
+
+  describe('#attachRPCRouter', () => {
+    it('should attached a router output', async () => {
+      // Mock dependencies
+      uut.ipfsCoord = {
+        privateLog: {},
+        ipfs: {
+          orbitdb: {
+            privateLog: {}
+          }
+        }
+      }
+
+      const router = console.log
+
+      uut.attachRPCRouter(router)
+    })
+
+    it('should throw an error if ipfs-coord has not been instantiated', () => {
+      try {
+        const router = console.log
+
+        uut.attachRPCRouter(router)
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(err.message, 'Cannot read property')
+      }
+    })
+  })
+})
diff --git a/test/unit/adapters/ipfs-index.adapter.unit.js b/test/unit/adapters/ipfs-index.adapter.unit.js
new file mode 100644
index 0000000..36190f4
--- /dev/null
+++ b/test/unit/adapters/ipfs-index.adapter.unit.js
@@ -0,0 +1,49 @@
+/*
+  Unit tests for the index.js file for the IPFS and ipfs-coord libraries.
+*/
+
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+const IPFSLib = require('../../../src/adapters/ipfs')
+const IPFSMock = require('../mocks/ipfs-mock')
+const IPFSCoordMock = require('../mocks/ipfs-coord-mock')
+
+describe('#IPFS', () => {
+  let uut
+  let sandbox
+
+  beforeEach(() => {
+    uut = new IPFSLib()
+
+    sandbox = sinon.createSandbox()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#start', () => {
+    it('should return a promise that resolves into an instance of IPFS.', async () => {
+      // Mock dependencies.
+      uut.ipfsAdapter = new IPFSMock()
+      uut.IpfsCoordAdapter = IPFSCoordMock
+
+      const result = await uut.start()
+
+      assert.equal(result, true)
+    })
+
+    it('should catch and throw an error', async () => {
+      try {
+        // Force an error
+        sandbox.stub(uut.ipfsAdapter, 'start').rejects(new Error('test error'))
+
+        await uut.start()
+
+        assert.fail('Unexpected code path.')
+      } catch (err) {
+        console.log(err)
+        assert.include(err.message, 'test error')
+      }
+    })
+  })
+})
diff --git a/test/unit/adapters/ipfs.adapter.unit.js b/test/unit/adapters/ipfs.adapter.unit.js
new file mode 100644
index 0000000..0a41200
--- /dev/null
+++ b/test/unit/adapters/ipfs.adapter.unit.js
@@ -0,0 +1,50 @@
+/*
+  Unit tests for the IPFS Adapter.
+*/
+
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+const IPFSLib = require('../../../src/adapters/ipfs/ipfs')
+const IPFSMock = require('../mocks/ipfs-mock')
+
+describe('#IPFS', () => {
+  let uut
+  let sandbox
+
+  beforeEach(() => {
+    uut = new IPFSLib()
+
+    sandbox = sinon.createSandbox()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#start', () => {
+    it('should return a promise that resolves into an instance of IPFS.', async () => {
+      // Mock dependencies.
+      uut.IPFS = IPFSMock
+
+      const result = await uut.start()
+      // console.log('result: ', result)
+
+      assert.equal(uut.isReady, true)
+
+      assert.property(result, 'config')
+    })
+
+    it('should catch and throw an error', async () => {
+      try {
+        // Force an error
+        sandbox.stub(uut.IPFS, 'create').rejects(new Error('test error'))
+
+        await uut.start()
+
+        assert.fail('Unexpected code path.')
+      } catch (err) {
+        console.log(err)
+        assert.include(err.message, 'test error')
+      }
+    })
+  })
+})
diff --git a/test/unit/mocks/ipfs-coord-mock.js b/test/unit/mocks/ipfs-coord-mock.js
new file mode 100644
index 0000000..b1924a1
--- /dev/null
+++ b/test/unit/mocks/ipfs-coord-mock.js
@@ -0,0 +1,13 @@
+/*
+  Mocks for the ipfs-coord library
+*/
+
+class IPFSCoord {
+  async isReady () {
+    return true
+  }
+
+  async start () {}
+}
+
+module.exports = IPFSCoord
diff --git a/test/unit/mocks/ipfs-mock.js b/test/unit/mocks/ipfs-mock.js
new file mode 100644
index 0000000..ff45da4
--- /dev/null
+++ b/test/unit/mocks/ipfs-mock.js
@@ -0,0 +1,31 @@
+/*
+  Mocks for the js-ipfs
+*/
+
+class IPFS {
+  constructor () {
+    this.ipfs = {}
+  }
+
+  static create () {
+    const mockIpfs = new MockIpfsInstance()
+
+    return mockIpfs
+  }
+
+  async start () {}
+}
+
+class MockIpfsInstance {
+  constructor () {
+    this.config = {
+      profiles: {
+        apply: () => {}
+      }
+    }
+  }
+
+  stop () {}
+}
+
+module.exports = IPFS

From 43b2b9dfdf7a3676cc0b847588d22bb300d08a75 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sun, 11 Jul 2021 21:59:18 -0700
Subject: [PATCH 35/43] Increased unit test coverage of controllers

---
 src/adapters/localdb/models/users.js          | 45 ++--------
 src/controllers/json-rpc/index.js             | 24 ++----
 test/unit/adapters/users.adapter.unit.js      | 82 +++++++++++++++++++
 test/unit/controllers/controllers.unit.js     | 37 +++++++++
 .../unit/controllers/json-rpc/a10-rpc.unit.js | 73 +++++++++++++++++
 5 files changed, 207 insertions(+), 54 deletions(-)
 create mode 100644 test/unit/adapters/users.adapter.unit.js
 create mode 100644 test/unit/controllers/controllers.unit.js

diff --git a/src/adapters/localdb/models/users.js b/src/adapters/localdb/models/users.js
index b8e0b0f..869e303 100644
--- a/src/adapters/localdb/models/users.js
+++ b/src/adapters/localdb/models/users.js
@@ -11,60 +11,33 @@ const User = new mongoose.Schema({
   email: {
     type: String,
     required: true,
-    unique: true,
-    validate: {
-      validator: function (email) {
-        // eslint-disable-next-line no-useless-escape
-        return /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)
-      },
-      message: props => `${props.value} is not a valid Email format!`
-    }
+    unique: true
   }
 })
 
 // Before saving, convert the password to a hash.
-User.pre('save', function preSave (next) {
+User.pre('save', async function preSave (next) {
   const user = this
 
   if (!user.isModified('password')) {
     return next()
   }
 
-  new Promise((resolve, reject) => {
-    bcrypt.genSalt(10, (err, salt) => {
-      if (err) {
-        return reject(err)
-      }
-      resolve(salt)
-    })
-  })
-    .then(salt => {
-      bcrypt.hash(user.password, salt, (err, hash) => {
-        if (err) {
-          throw new Error(err)
-        }
+  const salt = await bcrypt.genSalt(10)
+  const hash = await bcrypt.hash(user.password, salt)
 
-        user.password = hash
+  user.password = hash
 
-        next(null)
-      })
-    })
-    .catch(err => next(err))
+  next(null)
 })
 
 // Validate the password by comparing to the saved hash.
-User.methods.validatePassword = function validatePassword (password) {
+User.methods.validatePassword = async function validatePassword (password) {
   const user = this
 
-  return new Promise((resolve, reject) => {
-    bcrypt.compare(password, user.password, (err, isMatch) => {
-      if (err) {
-        return reject(err)
-      }
+  const isMatch = await bcrypt.compare(password, user.password)
 
-      resolve(isMatch)
-    })
-  })
+  return isMatch
 }
 
 // Generate a JWT token.
diff --git a/src/controllers/json-rpc/index.js b/src/controllers/json-rpc/index.js
index 73096f8..ef6bddf 100644
--- a/src/controllers/json-rpc/index.js
+++ b/src/controllers/json-rpc/index.js
@@ -110,25 +110,13 @@ class JSONRPC {
 
   // The default JSON RPC response if the incoming command could not be routed.
   defaultResponse () {
-    try {
-      // const errorObj = this.jsonrpc.error(
-      //   'Can not route',
-      //   new jsonrpc.JsonRpcError('Input does not match routing rules', 422)
-      // )
-      // const errorStr = JSON.stringify(errorObj)
-      // return errorStr
-
-      const errorObj = {
-        success: false,
-        status: 422,
-        message: 'Input does not match routing rules.'
-      }
-
-      return errorObj
-    } catch (err) {
-      console.error('Error in defaultResponse()')
-      throw err
+    const errorObj = {
+      success: false,
+      status: 422,
+      message: 'Input does not match routing rules.'
     }
+
+    return errorObj
   }
 }
 
diff --git a/test/unit/adapters/users.adapter.unit.js b/test/unit/adapters/users.adapter.unit.js
new file mode 100644
index 0000000..cc788db
--- /dev/null
+++ b/test/unit/adapters/users.adapter.unit.js
@@ -0,0 +1,82 @@
+/*
+  Unit tests for the users Mongoose model.
+*/
+
+const assert = require('chai').assert
+const sinon = require('sinon')
+const mongoose = require('mongoose')
+
+// Set the environment variable to signal this is a test.
+process.env.SVC_ENV = 'test'
+
+const User = require('../../../src/adapters/localdb/models/users')
+const config = require('../../../config')
+
+describe('#User-Adapter', () => {
+  // let uut
+  let sandbox
+  let testuser
+
+  before(async () => {
+    // Connect to the Mongo Database.
+    console.log(`Connecting to database: ${config.database}`)
+    mongoose.Promise = global.Promise
+    mongoose.set('useCreateIndex', true) // Stop deprecation warning.
+    await mongoose.connect(config.database, {
+      useUnifiedTopology: true,
+      useNewUrlParser: true
+    })
+
+    testuser = new User({
+      email: 'test983@test.com',
+      name: 'test983',
+      password: 'password'
+    })
+  })
+
+  beforeEach(async () => {
+    sandbox = sinon.createSandbox()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  after(async () => {
+    await testuser.remove()
+
+    mongoose.connection.close()
+  })
+
+  describe('#save', () => {
+    it('should replace the password with a salt', async () => {
+      await testuser.save()
+      // console.log('testuser: ', testuser)
+
+      assert.notEqual(testuser.password, 'password')
+    })
+  })
+
+  describe('#validatePassword', () => {
+    it('should return true when password matches', async () => {
+      const result = await testuser.validatePassword('password')
+      // console.log('result: ', result)
+
+      assert.equal(result, true)
+    })
+
+    it('should return false when password does not match', async () => {
+      const result = await testuser.validatePassword('wrongpassword')
+      // console.log('result: ', result)
+
+      assert.equal(result, false)
+    })
+  })
+
+  describe('#generateToken', () => {
+    it('should generate a JWT token', () => {
+      const token = testuser.generateToken()
+      // console.log('token: ', token)
+
+      assert.include(token, 'eyJ')
+    })
+  })
+})
diff --git a/test/unit/controllers/controllers.unit.js b/test/unit/controllers/controllers.unit.js
new file mode 100644
index 0000000..7600abc
--- /dev/null
+++ b/test/unit/controllers/controllers.unit.js
@@ -0,0 +1,37 @@
+/*
+  Unit tests for controllers index.js file.
+*/
+
+// Public npm libraries
+// const assert = require('chai').assert
+const sinon = require('sinon')
+
+const adapters = require('../../../src/adapters')
+const { attachControllers } = require('../../../src/controllers')
+
+describe('#Controllers', () => {
+  // let uut
+  let sandbox
+
+  beforeEach(() => {
+    sandbox = sinon.createSandbox()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#attachControllers', () => {
+    it('should attach the controllers', async () => {
+      // mock IPFS
+      sandbox.stub(adapters.ipfs, 'start').resolves({})
+      adapters.ipfs.ipfsCoordAdapter = {
+        attachRPCRouter: () => {}
+      }
+
+      const app = {
+        use: () => {}
+      }
+
+      await attachControllers(app)
+    })
+  })
+})
diff --git a/test/unit/controllers/json-rpc/a10-rpc.unit.js b/test/unit/controllers/json-rpc/a10-rpc.unit.js
index 1d6f218..ce63523 100644
--- a/test/unit/controllers/json-rpc/a10-rpc.unit.js
+++ b/test/unit/controllers/json-rpc/a10-rpc.unit.js
@@ -29,6 +29,34 @@ describe('#JSON RPC', () => {
 
   afterEach(() => sandbox.restore())
 
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new JSONRPC()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating JSON RPC Controllers.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new JSONRPC({ adapters })
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating JSON RPC Controllers.'
+        )
+      }
+    })
+  })
+
   describe('#router', () => {
     it('should exit quietly if given a random string', async () => {
       const str = 'random string message'
@@ -106,5 +134,50 @@ describe('#JSON RPC', () => {
       assert.equal(obj.result.method, 'users')
       assert.equal(obj.id, id)
     })
+
+    it('should route to auth handler', async () => {
+      const id = uid()
+      const userCall = jsonrpc.request(id, 'auth', { endpoint: 'getAll' })
+      const jsonStr = JSON.stringify(userCall, null, 2)
+
+      // Mock the controller.
+      sandbox.stub(uut.authController, 'authRouter').resolves('true')
+
+      const result = await uut.router(jsonStr, 'peerA')
+      // console.log(result)
+
+      const obj = JSON.parse(result.retStr)
+      // console.log('obj: ', obj)
+
+      assert.equal(obj.result.value, 'true')
+      assert.equal(obj.result.method, 'auth')
+      assert.equal(obj.id, id)
+    })
+
+    it('should route to about handler', async () => {
+      const id = uid()
+      const userCall = jsonrpc.request(id, 'about', { endpoint: 'getAll' })
+      const jsonStr = JSON.stringify(userCall, null, 2)
+
+      // Mock the controller.
+      sandbox.stub(uut.aboutController, 'aboutRouter').resolves('true')
+
+      // Force ipfs-coord communication.
+      uut.ipfsCoord.ipfs = {
+        orbitdb: {
+          sendToDb: () => {}
+        }
+      }
+
+      const result = await uut.router(jsonStr, 'peerA')
+      // console.log(result)
+
+      const obj = JSON.parse(result.retStr)
+      // console.log('obj: ', obj)
+
+      assert.equal(obj.result.value, 'true')
+      assert.equal(obj.result.method, 'about')
+      assert.equal(obj.id, id)
+    })
   })
 })

From 508369be013fe8df7aae07a8f668a7d6bf1ee8fa Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Mon, 12 Jul 2021 15:38:05 -0700
Subject: [PATCH 36/43] Increased unit test coverage of controllers

---
 src/controllers/json-rpc/about/index.js       |  4 +-
 .../json-rpc/a12-validators.unit.js           | 30 +++++++++++++--
 .../about.json-rpc.controller.unit.js         | 38 +++++++++++++++++++
 3 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 test/unit/controllers/json-rpc/about.json-rpc.controller.unit.js

diff --git a/src/controllers/json-rpc/about/index.js b/src/controllers/json-rpc/about/index.js
index 08e5221..6f3948a 100644
--- a/src/controllers/json-rpc/about/index.js
+++ b/src/controllers/json-rpc/about/index.js
@@ -8,7 +8,7 @@ const jsonrpc = require('jsonrpc-lite')
 // Local libraries
 const aboutStr = require('../../../../config/about')
 
-class AuthRPC {
+class AboutRPC {
   constructor (localConfig) {
     // Encapsulate dependencies
     this.jsonrpc = jsonrpc
@@ -42,4 +42,4 @@ class AuthRPC {
   }
 }
 
-module.exports = AuthRPC
+module.exports = AboutRPC
diff --git a/test/unit/controllers/json-rpc/a12-validators.unit.js b/test/unit/controllers/json-rpc/a12-validators.unit.js
index 8aefb7f..5677147 100644
--- a/test/unit/controllers/json-rpc/a12-validators.unit.js
+++ b/test/unit/controllers/json-rpc/a12-validators.unit.js
@@ -229,8 +229,9 @@ describe('#validators', () => {
 
     it('should throw an error if user can not be found', async () => {
       try {
-        // Force an error
-        sandbox.stub(uut.UserModel, 'findById').rejects(new Error('test error'))
+        // Mock external dependencies.
+        sandbox.stub(uut.jwt, 'verify').returns(true)
+        sandbox.stub(uut.UserModel, 'findById').resolves(null)
 
         // Generate the parsed data that the main router would pass to this
         // endpoint.
@@ -243,15 +244,38 @@ describe('#validators', () => {
         const jsonStr = JSON.stringify(userCall, null, 2)
         const rpcData = jsonrpc.parse(jsonStr)
 
+        await uut.ensureTargetUserOrAdmin(rpcData)
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        // console.log(err)
+        assert.include(err.message, 'User not found!')
+      }
+    })
+
+    it('should throw an error if JWT is from a different user', async () => {
+      try {
         // Mock external dependencies.
         sandbox.stub(uut.jwt, 'verify').returns(true)
+        sandbox.stub(uut.UserModel, 'findById').resolves({ _id: 'badId' })
+
+        // Generate the parsed data that the main router would pass to this
+        // endpoint.
+        const id = uid()
+        const userCall = jsonrpc.request(id, 'users', {
+          endpoint: 'deleteUser',
+          apiToken: 'fakeJWTToken',
+          userId: 'abc123'
+        })
+        const jsonStr = JSON.stringify(userCall, null, 2)
+        const rpcData = jsonrpc.parse(jsonStr)
 
         await uut.ensureTargetUserOrAdmin(rpcData)
 
         assert.fail('Unexpected code path')
       } catch (err) {
         // console.log(err)
-        assert.include(err.message, 'test error')
+        assert.include(err.message, 'User is neither admin nor target user.')
       }
     })
 
diff --git a/test/unit/controllers/json-rpc/about.json-rpc.controller.unit.js b/test/unit/controllers/json-rpc/about.json-rpc.controller.unit.js
new file mode 100644
index 0000000..39cac34
--- /dev/null
+++ b/test/unit/controllers/json-rpc/about.json-rpc.controller.unit.js
@@ -0,0 +1,38 @@
+/*
+  Unit tests for the json-rpc/about/index.js file.
+*/
+
+// Public npm libraries
+const sinon = require('sinon')
+const assert = require('chai').assert
+
+// Local libraries
+const AboutRPC = require('../../../../src/controllers/json-rpc/about')
+
+describe('#AboutRPC', () => {
+  let uut
+  let sandbox
+
+  beforeEach(() => {
+    sandbox = sinon.createSandbox()
+
+    uut = new AboutRPC()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#aboutRouter', () => {
+    it('should return information about the service', async () => {
+      const result = await uut.aboutRouter()
+      // console.log('result: ', result)
+
+      assert.property(result, 'success')
+      assert.equal(result.success, true)
+      assert.property(result, 'status')
+      assert.equal(result.status, 200)
+      assert.property(result, 'message')
+      assert.property(result, 'endpoint')
+      assert.equal(result.endpoint, 'about')
+    })
+  })
+})

From 4515fbed6431c069c7123fd653afc7d53ffd1a11 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Mon, 12 Jul 2021 15:46:09 -0700
Subject: [PATCH 37/43] Got auth json-rpc controller to 100% coverage

---
 ...it.js => auth.json-rpc.controller.unit.js} | 54 +++++++++----------
 1 file changed, 25 insertions(+), 29 deletions(-)
 rename test/unit/controllers/json-rpc/{a11-auth.unit.js => auth.json-rpc.controller.unit.js} (85%)

diff --git a/test/unit/controllers/json-rpc/a11-auth.unit.js b/test/unit/controllers/json-rpc/auth.json-rpc.controller.unit.js
similarity index 85%
rename from test/unit/controllers/json-rpc/a11-auth.unit.js
rename to test/unit/controllers/json-rpc/auth.json-rpc.controller.unit.js
index fcfc8a0..94052a6 100644
--- a/test/unit/controllers/json-rpc/a11-auth.unit.js
+++ b/test/unit/controllers/json-rpc/auth.json-rpc.controller.unit.js
@@ -4,7 +4,6 @@
 
 // Public npm libraries
 const jsonrpc = require('jsonrpc-lite')
-const mongoose = require('mongoose')
 const sinon = require('sinon')
 const assert = require('chai').assert
 const { v4: uid } = require('uuid')
@@ -13,7 +12,6 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const config = require('../../../../config')
 const AuthRPC = require('../../../../src/controllers/json-rpc/auth')
 const RateLimit = require('../../../../src/controllers/json-rpc/rate-limit')
 const adapters = require('../../mocks/adapters')
@@ -23,32 +21,10 @@ describe('#AuthRPC', () => {
   let uut
   let sandbox
 
-  before(async () => {
-    // Connect to the Mongo Database.
-    console.log(`Connecting to database: ${config.database}`)
-    mongoose.Promise = global.Promise
-    mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(config.database, {
-      useUnifiedTopology: true,
-      useNewUrlParser: true
-    })
-
-    // Create a test user.
-    // testUser = await userLib.createUser({
-    //   email: 'test543@test.com',
-    //   name: 'tester543',
-    //   password: 'password'
-    // })
-  })
-
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
     const useCases = new UseCasesMock()
-    // console.log('a11 useCases: ', useCases)
-    // console.log('a11 useCases.user: ', useCases.user)
-    // useCases.helloWorld()
-    // useCases.user.hello2()
 
     uut = new AuthRPC({ adapters, useCases })
     uut.rateLimit = new RateLimit({ max: 100 })
@@ -56,12 +32,32 @@ describe('#AuthRPC', () => {
 
   afterEach(() => sandbox.restore())
 
-  after(async () => {
-    // Delete the test user.
-    // testUser = await userLib.getUser({ id: testUser.userData._id })
-    // await userLib.deleteUser(testUser)
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new AuthRPC()
 
-    mongoose.connection.close()
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating Auth JSON RPC Controller.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new AuthRPC({ adapters })
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating Auth JSON RPC Controller.'
+        )
+      }
+    })
   })
 
   describe('#authRouter', () => {

From 49c38208985dd4daaba4d7130e57e199d54ae831 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Mon, 12 Jul 2021 15:49:56 -0700
Subject: [PATCH 38/43] Increased user json-rpc controller to 100% unit test
 coverage

---
 ...t.js => users.json-rpc-controller.unit.js} | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)
 rename test/unit/controllers/json-rpc/{a13-users.unit.js => users.json-rpc-controller.unit.js} (94%)

diff --git a/test/unit/controllers/json-rpc/a13-users.unit.js b/test/unit/controllers/json-rpc/users.json-rpc-controller.unit.js
similarity index 94%
rename from test/unit/controllers/json-rpc/a13-users.unit.js
rename to test/unit/controllers/json-rpc/users.json-rpc-controller.unit.js
index 2c7d7f2..2d95c96 100644
--- a/test/unit/controllers/json-rpc/a13-users.unit.js
+++ b/test/unit/controllers/json-rpc/users.json-rpc-controller.unit.js
@@ -4,7 +4,6 @@
 
 // Public npm libraries
 const jsonrpc = require('jsonrpc-lite')
-const mongoose = require('mongoose')
 const sinon = require('sinon')
 const assert = require('chai').assert
 const { v4: uid } = require('uuid')
@@ -13,7 +12,6 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const config = require('../../../../config')
 const UserRPC = require('../../../../src/controllers/json-rpc/users')
 const RateLimit = require('../../../../src/controllers/json-rpc/rate-limit')
 // const UserModel = require('../../../src/adapters/localdb/models/users')
@@ -25,17 +23,6 @@ describe('#UserRPC', () => {
   let sandbox
   let testUser
 
-  before(async () => {
-    // Connect to the Mongo Database.
-    console.log(`Connecting to database: ${config.database}`)
-    mongoose.Promise = global.Promise
-    mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(config.database, {
-      useUnifiedTopology: true,
-      useNewUrlParser: true
-    })
-  })
-
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
@@ -47,8 +34,32 @@ describe('#UserRPC', () => {
 
   afterEach(() => sandbox.restore())
 
-  after(() => {
-    mongoose.connection.close()
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new UserRPC()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating User JSON RPC Controller.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new UserRPC({ adapters })
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating User JSON RPC Controller.'
+        )
+      }
+    })
   })
 
   describe('#createUser', () => {

From 078b708a3e88ad40763aa0d07b815c51ba9c8d9d Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Mon, 12 Jul 2021 17:37:49 -0700
Subject: [PATCH 39/43] Refactored users REST API controller and router

---
 src/controllers/rest-api/index.js             | 12 +--
 src/controllers/rest-api/users/controller.js  |  6 --
 src/controllers/rest-api/users/index.js       | 67 ++++++++++++-
 src/controllers/rest-api/users/router.js      | 87 -----------------
 test/e2e/automated/a02-users.rest-e2e.js      |  2 +-
 .../users.json-rpc-controller.unit.js         |  3 -
 .../rest-api/rest.controller.unit.js          | 64 +++++++++++++
 .../users.rest.controller.unit.js}            | 93 +++++++++----------
 .../rest-api/users/users.rest.router.unit.js  | 78 ++++++++++++++++
 test/unit/mocks/app-mock.js                   |  9 ++
 10 files changed, 265 insertions(+), 156 deletions(-)
 delete mode 100644 src/controllers/rest-api/users/router.js
 create mode 100644 test/unit/controllers/rest-api/rest.controller.unit.js
 rename test/unit/controllers/rest-api/{a02-users.rest-unit.js => users/users.rest.controller.unit.js} (76%)
 create mode 100644 test/unit/controllers/rest-api/users/users.rest.router.unit.js
 create mode 100644 test/unit/mocks/app-mock.js

diff --git a/src/controllers/rest-api/index.js b/src/controllers/rest-api/index.js
index 505d091..90255d8 100644
--- a/src/controllers/rest-api/index.js
+++ b/src/controllers/rest-api/index.js
@@ -8,23 +8,23 @@
 
 // Load the REST API Controllers.
 const AuthRESTController = require('./auth')
-const UserRESTController = require('./users')
+const UserRouter = require('./users')
 const ContactRESTController = require('./contact')
 const LogsRESTController = require('./logs')
 
 class RESTControllers {
-  constructor (localConfig) {
+  constructor (localConfig = {}) {
     // Dependency Injection.
     this.adapters = localConfig.adapters
     if (!this.adapters) {
       throw new Error(
-        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+        'Instance of Adapters library required when instantiating REST Controller libraries.'
       )
     }
     this.useCases = localConfig.useCases
     if (!this.useCases) {
       throw new Error(
-        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+        'Instance of Use Cases library required when instantiating REST Controller libraries.'
       )
     }
 
@@ -42,8 +42,8 @@ class RESTControllers {
     authRESTController.attach(app)
 
     // Attach the REST API Controllers associated with the /user route
-    const userRESTController = new UserRESTController(dependencies)
-    userRESTController.attach(app)
+    const userRouter = new UserRouter(dependencies)
+    userRouter.attach(app)
 
     // Attach the REST API Controllers associated with the /contact route
     const contactRESTController = new ContactRESTController(dependencies)
diff --git a/src/controllers/rest-api/users/controller.js b/src/controllers/rest-api/users/controller.js
index 7fd9e54..01ab82b 100644
--- a/src/controllers/rest-api/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -2,12 +2,6 @@
   REST API Controller library for the /user route
 */
 
-// User database model.
-// const UserModel = require('../../../adapters/localdb/models/users')
-
-// User library for business logic.
-// const UserLib = require('../../../use-cases/user')
-
 const { wlogger } = require('../../../adapters/wlogger')
 
 let _this
diff --git a/src/controllers/rest-api/users/index.js b/src/controllers/rest-api/users/index.js
index 302b701..c829615 100644
--- a/src/controllers/rest-api/users/index.js
+++ b/src/controllers/rest-api/users/index.js
@@ -2,9 +2,16 @@
   REST API library for /user route.
 */
 
-const UserRESTRouter = require('./router')
+// Public npm libraries.
+const Router = require('koa-router')
 
-class UserRESTController {
+// Local libraries.
+const UserRESTControllerLib = require('./controller')
+const Validators = require('../middleware/validators')
+
+let _this
+
+class UserRouter {
   constructor (localConfig = {}) {
     // Dependency Injection.
     this.adapters = localConfig.adapters
@@ -20,12 +27,62 @@ class UserRESTController {
       )
     }
 
-    this.userRESTRouter = new UserRESTRouter(localConfig)
+    const dependencies = {
+      adapters: this.adapters,
+      useCases: this.useCases
+    }
+
+    // Encapsulate dependencies.
+    this.userRESTController = new UserRESTControllerLib(dependencies)
+    this.validators = new Validators()
+
+    // Instantiate the router and set the base route.
+    const baseUrl = '/users'
+    this.router = new Router({ prefix: baseUrl })
+
+    _this = this
   }
 
   attach (app) {
-    this.userRESTRouter.attachControllers(app)
+    if (!app) {
+      throw new Error(
+        'Must pass app object when attaching REST API controllers.'
+      )
+    }
+
+    // Define the routes and attach the controller.
+    this.router.post('/', this.userRESTController.createUser)
+    this.router.get('/', this.getAll)
+    this.router.get('/:id', this.getById)
+    this.router.put('/:id', this.updateUser)
+    this.router.delete('/:id', this.deleteUser)
+
+    // Attach the Controller routes to the Koa app.
+    app.use(this.router.routes())
+    app.use(this.router.allowedMethods())
+  }
+
+  async getAll (ctx, next) {
+    await _this.validators.ensureUser(ctx, next)
+    await _this.userRESTController.getUsers(ctx, next)
+  }
+
+  async getById (ctx, next) {
+    await _this.validators.ensureUser(ctx, next)
+    await _this.userRESTController.getUser(ctx, next)
+  }
+
+  async updateUser (ctx, next) {
+    await _this.validators.ensureTargetUserOrAdmin(ctx, next)
+    await _this.userRESTController.getUser(ctx, next)
+    await _this.userRESTController.updateUser(ctx, next)
+  }
+
+  async deleteUser (ctx, next) {
+    await _this.validators.ensureTargetUserOrAdmin(ctx, next)
+    await _this.userRESTController.getUser(ctx, next)
+    await _this.userRESTController.deleteUser(ctx, next)
   }
 }
 
-module.exports = UserRESTController
+module.exports = UserRouter
diff --git a/src/controllers/rest-api/users/router.js b/src/controllers/rest-api/users/router.js
deleted file mode 100644
index a57086a..0000000
--- a/src/controllers/rest-api/users/router.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-  REST Router for the /user route.
-*/
-
-// Public npm libraries.
-const Router = require('koa-router')
-
-// Local libraries.
-const UserRESTControllerLib = require('./controller')
-const Validators = require('../middleware/validators')
-
-let _this
-
-class UserRESTRouter {
-  constructor (localConfig = {}) {
-    // Dependency Injection.
-    this.adapters = localConfig.adapters
-    if (!this.adapters) {
-      throw new Error(
-        'Instance of Adapters library required when instantiating /users REST Controller.'
-      )
-    }
-    this.useCases = localConfig.useCases
-    if (!this.useCases) {
-      throw new Error(
-        'Instance of Use Cases library required when instantiating /users REST Controller.'
-      )
-    }
-    const dependencies = {
-      adapters: this.adapters,
-      useCases: this.useCases
-    }
-
-    // Encapsulate dependencies.
-    this.userRESTController = new UserRESTControllerLib(dependencies)
-    this.validators = new Validators()
-
-    // Instantiate the router and set the base route.
-    const baseUrl = '/users'
-    this.router = new Router({ prefix: baseUrl })
-
-    _this = this
-  }
-
-  attachControllers (app) {
-    if (!app) {
-      throw new Error(
-        'Must pass app object when attaching REST API controllers.'
-      )
-    }
-
-    // Define the routes and attach the controller.
-    this.router.post('/', this.userRESTController.createUser)
-    this.router.get('/', this.getAll)
-    this.router.get('/:id', this.getById)
-    this.router.put('/:id', this.updateUser)
-    this.router.delete('/:id', this.deleteUser)
-
-    // Attach the Controller routes to the Koa app.
-    app.use(this.router.routes())
-    app.use(this.router.allowedMethods())
-  }
-
-  async getAll (ctx, next) {
-    await _this.validators.ensureUser(ctx, next)
-    await _this.userRESTController.getUsers(ctx, next)
-  }
-
-  async getById (ctx, next) {
-    await _this.validators.ensureUser(ctx, next)
-    await _this.userRESTController.getUser(ctx, next)
-  }
-
-  async updateUser (ctx, next) {
-    await _this.validators.ensureTargetUserOrAdmin(ctx, next)
-    await _this.userRESTController.getUser(ctx, next)
-    await _this.userRESTController.updateUser(ctx, next)
-  }
-
-  async deleteUser (ctx, next) {
-    await _this.validators.ensureTargetUserOrAdmin(ctx, next)
-    await _this.userRESTController.getUser(ctx, next)
-    await _this.userRESTController.deleteUser(ctx, next)
-  }
-}
-
-module.exports = UserRESTRouter
diff --git a/test/e2e/automated/a02-users.rest-e2e.js b/test/e2e/automated/a02-users.rest-e2e.js
index 1ccdd46..439c6e1 100644
--- a/test/e2e/automated/a02-users.rest-e2e.js
+++ b/test/e2e/automated/a02-users.rest-e2e.js
@@ -292,7 +292,7 @@ describe('Users', () => {
 
         assert.fail('Unexpected code path!')
       } catch (err) {
-        console.log(err)
+        // console.log(err)
         assert.equal(err.response.status, 422)
         assert.equal(err.response.data, 'test error')
       }
diff --git a/test/unit/controllers/json-rpc/users.json-rpc-controller.unit.js b/test/unit/controllers/json-rpc/users.json-rpc-controller.unit.js
index 2d95c96..61aa0d3 100644
--- a/test/unit/controllers/json-rpc/users.json-rpc-controller.unit.js
+++ b/test/unit/controllers/json-rpc/users.json-rpc-controller.unit.js
@@ -13,8 +13,6 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const UserRPC = require('../../../../src/controllers/json-rpc/users')
-const RateLimit = require('../../../../src/controllers/json-rpc/rate-limit')
-// const UserModel = require('../../../src/adapters/localdb/models/users')
 const adapters = require('../../mocks/adapters')
 const UseCasesMock = require('../../mocks/use-cases')
 
@@ -29,7 +27,6 @@ describe('#UserRPC', () => {
     const useCases = new UseCasesMock()
 
     uut = new UserRPC({ adapters, useCases })
-    uut.rateLimit = new RateLimit({ max: 100 })
   })
 
   afterEach(() => sandbox.restore())
diff --git a/test/unit/controllers/rest-api/rest.controller.unit.js b/test/unit/controllers/rest-api/rest.controller.unit.js
new file mode 100644
index 0000000..f798edb
--- /dev/null
+++ b/test/unit/controllers/rest-api/rest.controller.unit.js
@@ -0,0 +1,64 @@
+/*
+  Unit tests for the REST API controllers/rest-api/index.js library.
+*/
+
+// Public npm libraries
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+// Local libraries
+const RESTControllers = require('../../../../src/controllers/rest-api/')
+// const mockContext = require('../../../unit/mocks/ctx-mock').context
+const adapters = require('../../mocks/adapters')
+const UseCasesMock = require('../../mocks/use-cases')
+
+describe('#RESTControllers', () => {
+  let uut
+  let sandbox
+  // let ctx
+
+  before(async () => {})
+
+  beforeEach(() => {
+    const useCases = new UseCasesMock()
+    uut = new RESTControllers({ adapters, useCases })
+
+    sandbox = sinon.createSandbox()
+
+    // Mock the context object.
+    // ctx = mockContext()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new RESTControllers()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating REST Controller libraries.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new RESTControllers({ adapters })
+
+        assert.fail('Unexpected code path')
+
+        // use to prevent complaints from linter.
+        console.log('uut: ', uut)
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating REST Controller libraries.'
+        )
+      }
+    })
+  })
+})
diff --git a/test/unit/controllers/rest-api/a02-users.rest-unit.js b/test/unit/controllers/rest-api/users/users.rest.controller.unit.js
similarity index 76%
rename from test/unit/controllers/rest-api/a02-users.rest-unit.js
rename to test/unit/controllers/rest-api/users/users.rest.controller.unit.js
index ba6e3e8..737d86b 100644
--- a/test/unit/controllers/rest-api/a02-users.rest-unit.js
+++ b/test/unit/controllers/rest-api/users/users.rest.controller.unit.js
@@ -5,62 +5,21 @@
 // Public npm libraries
 const assert = require('chai').assert
 const sinon = require('sinon')
-const mongoose = require('mongoose')
 
 // Local support libraries
-const config = require('../../../../config')
-const testUtils = require('../../../utils/test-utils')
-const adapters = require('../../mocks/adapters')
-const UseCasesMock = require('../../mocks/use-cases')
+const adapters = require('../../../mocks/adapters')
+const UseCasesMock = require('../../../mocks/use-cases')
 
-const UserController = require('../../../../src/controllers/rest-api/users/controller')
+const UserController = require('../../../../../src/controllers/rest-api/users/controller')
 let uut
 let sandbox
 let ctx
 
-const mockContext = require('../../../unit/mocks/ctx-mock').context
+const mockContext = require('../../../../unit/mocks/ctx-mock').context
 
-describe('Users', () => {
+describe('#Users-REST-Controller', () => {
   // const testUser = {}
 
-  before(async () => {
-    // Connect to the Mongo Database.
-    mongoose.Promise = global.Promise
-    mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(config.database, {
-      useUnifiedTopology: true,
-      useNewUrlParser: true
-    })
-
-    // Delete all previous users in the database.
-    await testUtils.deleteAllUsers()
-
-    // console.log(`config: ${JSON.stringify(config, null, 2)}`)
-
-    // Create a second test user.
-    // const userObj = {
-    //   email: 'test2@test.com',
-    //   password: 'pass2'
-    // }
-    // const testUser = await testUtils.createUser(userObj)
-    // console.log(`testUser2: ${JSON.stringify(testUser, null, 2)}`)
-
-    // context.user2 = testUser.user
-    // context.token2 = testUser.token
-    // context.id2 = testUser.user._id
-
-    // Get the JWT used to log in as the admin 'system' user.
-    // const adminJWT = await testUtils.getAdminJWT()
-    // // console.log(`adminJWT: ${adminJWT}`)
-    // context.adminJWT = adminJWT
-
-    // const admin = await testUtils.loginAdminUser()
-    // context.adminJWT = admin.token
-
-    // const admin = await adminLib.loginAdmin()
-    // console.log(`admin: ${JSON.stringify(admin, null, 2)}`)
-  })
-
   beforeEach(() => {
     const useCases = new UseCasesMock()
     uut = new UserController({ adapters, useCases })
@@ -73,8 +32,32 @@ describe('Users', () => {
 
   afterEach(() => sandbox.restore())
 
-  after(() => {
-    mongoose.connection.close()
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new UserController()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating /users REST Controller.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new UserController({ adapters })
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating /users REST Controller.'
+        )
+      }
+    })
   })
 
   describe('#POST /users', () => {
@@ -258,4 +241,18 @@ describe('Users', () => {
       assert.equal(ctx.status, 200)
     })
   })
+
+  describe('#handleError', () => {
+    it('should still throw error if there is no message', () => {
+      try {
+        const err = {
+          status: 404
+        }
+
+        uut.handleError(ctx, err)
+      } catch (err) {
+        assert.include(err.message, 'Not Found')
+      }
+    })
+  })
 })
diff --git a/test/unit/controllers/rest-api/users/users.rest.router.unit.js b/test/unit/controllers/rest-api/users/users.rest.router.unit.js
new file mode 100644
index 0000000..f225562
--- /dev/null
+++ b/test/unit/controllers/rest-api/users/users.rest.router.unit.js
@@ -0,0 +1,78 @@
+/*
+  Unit tests for the REST API handler for the /users endpoints.
+*/
+
+// Public npm libraries
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+// Local support libraries
+const adapters = require('../../../mocks/adapters')
+const UseCasesMock = require('../../../mocks/use-cases')
+// const app = require('../../../mocks/app-mock')
+
+const UserRouter = require('../../../../../src/controllers/rest-api/users')
+let uut
+let sandbox
+// let ctx
+
+// const mockContext = require('../../../../unit/mocks/ctx-mock').context
+
+describe('#Users-REST-Router', () => {
+  // const testUser = {}
+
+  beforeEach(() => {
+    const useCases = new UseCasesMock()
+    uut = new UserRouter({ adapters, useCases })
+
+    sandbox = sinon.createSandbox()
+
+    // Mock the context object.
+    // ctx = mockContext()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new UserRouter()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new UserRouter({ adapters })
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+        )
+      }
+    })
+  })
+
+  describe('#attach', () => {
+    it('should throw an error if app is not passed in.', () => {
+      try {
+        uut.attach()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Must pass app object when attaching REST API controllers.'
+        )
+      }
+    })
+  })
+})
diff --git a/test/unit/mocks/app-mock.js b/test/unit/mocks/app-mock.js
new file mode 100644
index 0000000..e341212
--- /dev/null
+++ b/test/unit/mocks/app-mock.js
@@ -0,0 +1,9 @@
+/*
+  Mocks for Koa 'app' object.
+*/
+
+const app = {
+  use: () => {}
+}
+
+module.exports = app

From 268a7aadab75e7b9bd4a966b56b08071c303e945 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Mon, 12 Jul 2021 18:10:26 -0700
Subject: [PATCH 40/43] Increased unit test coverage to 100% for REST auth
 endpoint

---
 src/controllers/rest-api/auth/controller.js   |  4 +-
 src/controllers/rest-api/auth/index.js        | 30 +++++--
 src/controllers/rest-api/auth/router.js       | 51 -----------
 .../auth/auth.rest.controller.unit.js         | 90 +++++++++++++++++++
 .../rest-api/auth/auth.rest.router.unit.js    | 78 ++++++++++++++++
 5 files changed, 195 insertions(+), 58 deletions(-)
 delete mode 100644 src/controllers/rest-api/auth/router.js
 create mode 100644 test/unit/controllers/rest-api/auth/auth.rest.controller.unit.js
 create mode 100644 test/unit/controllers/rest-api/auth/auth.rest.router.unit.js

diff --git a/src/controllers/rest-api/auth/controller.js b/src/controllers/rest-api/auth/controller.js
index 5c5f140..a542b79 100644
--- a/src/controllers/rest-api/auth/controller.js
+++ b/src/controllers/rest-api/auth/controller.js
@@ -9,13 +9,13 @@ class AuthRESTController {
     this.adapters = localConfig.adapters
     if (!this.adapters) {
       throw new Error(
-        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+        'Instance of Adapters library required when instantiating Auth REST Controller.'
       )
     }
     this.useCases = localConfig.useCases
     if (!this.useCases) {
       throw new Error(
-        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+        'Instance of Use Cases library required when instantiating Auth REST Controller.'
       )
     }
 
diff --git a/src/controllers/rest-api/auth/index.js b/src/controllers/rest-api/auth/index.js
index 0ea355a..71da067 100644
--- a/src/controllers/rest-api/auth/index.js
+++ b/src/controllers/rest-api/auth/index.js
@@ -2,9 +2,13 @@
   REST API library for auth route.
 */
 
-const AuthRESTRouter = require('./router')
+// Public npm libraries.
+const Router = require('koa-router')
 
-class AuthRESTController {
+// Local libraries.
+const AuthRESTController = require('./controller')
+
+class AuthRouter {
   constructor (localConfig = {}) {
     // Dependency Injection.
     this.adapters = localConfig.adapters
@@ -20,12 +24,28 @@ class AuthRESTController {
       )
     }
 
-    this.authRESTRouter = new AuthRESTRouter(localConfig)
+    // Encapsulate dependencies.
+    this.authRESTController = new AuthRESTController(localConfig)
+
+    // Instantiate the router and set the base route.
+    const baseUrl = '/auth'
+    this.router = new Router({ prefix: baseUrl })
   }
 
   attach (app) {
-    this.authRESTRouter.attachControllers(app)
+    if (!app) {
+      throw new Error(
+        'Must pass app object when attached REST API controllers.'
+      )
+    }
+
+    // Define the routes and attach the controller.
+    this.router.post('/', this.authRESTController.authUser)
+
+    // Attach the Controller routes to the Koa app.
+    app.use(this.router.routes())
+    app.use(this.router.allowedMethods())
   }
 }
 
-module.exports = AuthRESTController
+module.exports = AuthRouter
diff --git a/src/controllers/rest-api/auth/router.js b/src/controllers/rest-api/auth/router.js
deleted file mode 100644
index 6320ebd..0000000
--- a/src/controllers/rest-api/auth/router.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  REST Router for the /auth route.
-*/
-
-// Public npm libraries.
-const Router = require('koa-router')
-
-// Local libraries.
-const AuthRESTController = require('./controller')
-
-class AuthRESTRouter {
-  constructor (localConfig = {}) {
-    // Dependency Injection.
-    this.adapters = localConfig.adapters
-    if (!this.adapters) {
-      throw new Error(
-        'Instance of Adapters library required when instantiating PostEntry REST Controller.'
-      )
-    }
-    this.useCases = localConfig.useCases
-    if (!this.useCases) {
-      throw new Error(
-        'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
-      )
-    }
-
-    // Encapsulate dependencies.
-    this.authRESTController = new AuthRESTController(localConfig)
-
-    // Instantiate the router and set the base route.
-    const baseUrl = '/auth'
-    this.router = new Router({ prefix: baseUrl })
-  }
-
-  attachControllers (app) {
-    if (!app) {
-      throw new Error(
-        'Must pass app object when attached REST API controllers.'
-      )
-    }
-
-    // Define the routes and attach the controller.
-    this.router.post('/', this.authRESTController.authUser)
-
-    // Attach the Controller routes to the Koa app.
-    app.use(this.router.routes())
-    app.use(this.router.allowedMethods())
-  }
-}
-
-module.exports = AuthRESTRouter
diff --git a/test/unit/controllers/rest-api/auth/auth.rest.controller.unit.js b/test/unit/controllers/rest-api/auth/auth.rest.controller.unit.js
new file mode 100644
index 0000000..454269c
--- /dev/null
+++ b/test/unit/controllers/rest-api/auth/auth.rest.controller.unit.js
@@ -0,0 +1,90 @@
+/*
+  Unit tests for the REST API handler for the /users endpoints.
+*/
+
+// Public npm libraries
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+// Local support libraries
+const adapters = require('../../../mocks/adapters')
+const UseCasesMock = require('../../../mocks/use-cases')
+// const app = require('../../../mocks/app-mock')
+
+const AuthRESTController = require('../../../../../src/controllers/rest-api/auth/controller')
+let uut
+let sandbox
+let ctx
+
+const mockContext = require('../../../../unit/mocks/ctx-mock').context
+
+describe('#Auth-REST-Router', () => {
+  // const testUser = {}
+
+  beforeEach(() => {
+    const useCases = new UseCasesMock()
+    uut = new AuthRESTController({ adapters, useCases })
+
+    sandbox = sinon.createSandbox()
+
+    // Mock the context object.
+    ctx = mockContext()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new AuthRESTController()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating Auth REST Controller.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new AuthRESTController({ adapters })
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating Auth REST Controller.'
+        )
+      }
+    })
+  })
+
+  describe('#authUser', () => {
+    it('should authorize a user', async () => {
+      // Mock dependencies
+      const user = {
+        toJSON: () => {
+          return { password: 'password' }
+        },
+        generateToken: () => {}
+      }
+      sandbox.stub(uut.passport, 'authUser').resolves(user)
+
+      await uut.authUser(ctx)
+    })
+
+    it('should catch and throw an error', async () => {
+      try {
+        // Force an error
+        sandbox.stub(uut.passport, 'authUser').rejects('test error')
+
+        await uut.authUser(ctx)
+      } catch (err) {
+        // console.log('err: ', err)
+        assert.include(err.message, 'Unauthorized')
+      }
+    })
+  })
+})
diff --git a/test/unit/controllers/rest-api/auth/auth.rest.router.unit.js b/test/unit/controllers/rest-api/auth/auth.rest.router.unit.js
new file mode 100644
index 0000000..86325e1
--- /dev/null
+++ b/test/unit/controllers/rest-api/auth/auth.rest.router.unit.js
@@ -0,0 +1,78 @@
+/*
+  Unit tests for the REST API handler for the /users endpoints.
+*/
+
+// Public npm libraries
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+// Local support libraries
+const adapters = require('../../../mocks/adapters')
+const UseCasesMock = require('../../../mocks/use-cases')
+// const app = require('../../../mocks/app-mock')
+
+const AuthRouter = require('../../../../../src/controllers/rest-api/auth')
+let uut
+let sandbox
+// let ctx
+
+// const mockContext = require('../../../../unit/mocks/ctx-mock').context
+
+describe('#Auth-REST-Router', () => {
+  // const testUser = {}
+
+  beforeEach(() => {
+    const useCases = new UseCasesMock()
+    uut = new AuthRouter({ adapters, useCases })
+
+    sandbox = sinon.createSandbox()
+
+    // Mock the context object.
+    // ctx = mockContext()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new AuthRouter()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating PostEntry REST Controller.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new AuthRouter({ adapters })
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating PostEntry REST Controller.'
+        )
+      }
+    })
+  })
+
+  describe('#attach', () => {
+    it('should throw an error if app is not passed in.', () => {
+      try {
+        uut.attach()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Must pass app object when attached REST API controllers.'
+        )
+      }
+    })
+  })
+})

From e3ec7f92efa4b29ff37b0d58f48c68f852f57e24 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 13 Jul 2021 07:41:35 -0700
Subject: [PATCH 41/43] Increased contact REST endpoint to 100% unit test
 coverage

---
 src/controllers/rest-api/contact/index.js     | 51 ++++++++++--
 src/controllers/rest-api/contact/router.js    | 43 ----------
 .../contact.rest.controller.unit.js}          | 31 +++++++-
 .../contact/contact.rest.router.unit.js       | 78 +++++++++++++++++++
 4 files changed, 153 insertions(+), 50 deletions(-)
 delete mode 100644 src/controllers/rest-api/contact/router.js
 rename test/unit/controllers/rest-api/{a04-contact.rest-api.js => contact/contact.rest.controller.unit.js} (63%)
 create mode 100644 test/unit/controllers/rest-api/contact/contact.rest.router.unit.js

diff --git a/src/controllers/rest-api/contact/index.js b/src/controllers/rest-api/contact/index.js
index 3ea84eb..e4db57a 100644
--- a/src/controllers/rest-api/contact/index.js
+++ b/src/controllers/rest-api/contact/index.js
@@ -2,16 +2,57 @@
   REST API library for /contact route.
 */
 
-const ContactRESTRouter = require('./router')
+// Public npm libraries.
+const Router = require('koa-router')
 
-class ContactRESTController {
+// Local libraries.
+const ContactRESTControllerLib = require('./controller')
+const Validators = require('../middleware/validators')
+
+class ContactRouter {
   constructor (localConfig = {}) {
-    this.contactRESTRouter = new ContactRESTRouter()
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating Contact REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating Contact REST Controller.'
+      )
+    }
+
+    const dependencies = {
+      adapters: this.adapters,
+      useCases: this.useCases
+    }
+
+    // Encapsulate dependencies.
+    this.contactRESTController = new ContactRESTControllerLib(dependencies)
+    this.validators = new Validators()
+
+    // Instantiate the router and set the base route.
+    const baseUrl = '/contact'
+    this.router = new Router({ prefix: baseUrl })
   }
 
   attach (app) {
-    this.contactRESTRouter.attachControllers(app)
+    if (!app) {
+      throw new Error(
+        'Must pass app object when attaching REST API controllers.'
+      )
+    }
+
+    // Define the routes and attach the controller.
+    this.router.post('/email', this.contactRESTController.email)
+
+    // Attach the Controller routes to the Koa app.
+    app.use(this.router.routes())
+    app.use(this.router.allowedMethods())
   }
 }
 
-module.exports = ContactRESTController
+module.exports = ContactRouter
diff --git a/src/controllers/rest-api/contact/router.js b/src/controllers/rest-api/contact/router.js
deleted file mode 100644
index 02914f9..0000000
--- a/src/controllers/rest-api/contact/router.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-  REST Router for the /contact route.
-*/
-
-// Public npm libraries.
-const Router = require('koa-router')
-
-// Local libraries.
-const ContactRESTControllerLib = require('./controller')
-const Validators = require('../middleware/validators')
-
-// let _this
-
-class ContactRESTRouter {
-  constructor (localConfig = {}) {
-    // Encapsulate dependencies.
-    this.contactRESTController = new ContactRESTControllerLib()
-    this.validators = new Validators()
-
-    // Instantiate the router and set the base route.
-    const baseUrl = '/contact'
-    this.router = new Router({ prefix: baseUrl })
-
-    // _this = this
-  }
-
-  attachControllers (app) {
-    if (!app) {
-      throw new Error(
-        'Must pass app object when attaching REST API controllers.'
-      )
-    }
-
-    // Define the routes and attach the controller.
-    this.router.post('/email', this.contactRESTController.email)
-
-    // Attach the Controller routes to the Koa app.
-    app.use(this.router.routes())
-    app.use(this.router.allowedMethods())
-  }
-}
-
-module.exports = ContactRESTRouter
diff --git a/test/unit/controllers/rest-api/a04-contact.rest-api.js b/test/unit/controllers/rest-api/contact/contact.rest.controller.unit.js
similarity index 63%
rename from test/unit/controllers/rest-api/a04-contact.rest-api.js
rename to test/unit/controllers/rest-api/contact/contact.rest.controller.unit.js
index 9e30e79..73e2f07 100644
--- a/test/unit/controllers/rest-api/a04-contact.rest-api.js
+++ b/test/unit/controllers/rest-api/contact/contact.rest.controller.unit.js
@@ -6,12 +6,12 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const ContactController = require('../../../../src/controllers/rest-api/contact/controller')
+const ContactController = require('../../../../../src/controllers/rest-api/contact/controller')
 let uut
 let sandbox
 let ctx
 
-const mockContext = require('../../../unit/mocks/ctx-mock').context
+const mockContext = require('../../../../unit/mocks/ctx-mock').context
 
 describe('Contact', () => {
   before(async () => {})
@@ -58,4 +58,31 @@ describe('Contact', () => {
       assert.isTrue(ctx.response.body.success)
     })
   })
+
+  describe('#handleError', () => {
+    it('should pass an error message', () => {
+      try {
+        const err = {
+          status: 422,
+          message: 'Unprocessable Entity'
+        }
+
+        uut.handleError(ctx, err)
+      } catch (err) {
+        assert.include(err.message, 'Unprocessable Entity')
+      }
+    })
+
+    it('should still throw error if there is no message', () => {
+      try {
+        const err = {
+          status: 404
+        }
+
+        uut.handleError(ctx, err)
+      } catch (err) {
+        assert.include(err.message, 'Not Found')
+      }
+    })
+  })
 })
diff --git a/test/unit/controllers/rest-api/contact/contact.rest.router.unit.js b/test/unit/controllers/rest-api/contact/contact.rest.router.unit.js
new file mode 100644
index 0000000..d3e8934
--- /dev/null
+++ b/test/unit/controllers/rest-api/contact/contact.rest.router.unit.js
@@ -0,0 +1,78 @@
+/*
+  Unit tests for the REST API handler for the /users endpoints.
+*/
+
+// Public npm libraries
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+// Local support libraries
+const adapters = require('../../../mocks/adapters')
+const UseCasesMock = require('../../../mocks/use-cases')
+// const app = require('../../../mocks/app-mock')
+
+const ContactRouter = require('../../../../../src/controllers/rest-api/contact')
+let uut
+let sandbox
+// let ctx
+
+// const mockContext = require('../../../../unit/mocks/ctx-mock').context
+
+describe('#Contact-REST-Router', () => {
+  // const testUser = {}
+
+  beforeEach(() => {
+    const useCases = new UseCasesMock()
+    uut = new ContactRouter({ adapters, useCases })
+
+    sandbox = sinon.createSandbox()
+
+    // Mock the context object.
+    // ctx = mockContext()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new ContactRouter()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating Contact REST Controller.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new ContactRouter({ adapters })
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating Contact REST Controller.'
+        )
+      }
+    })
+  })
+
+  describe('#attach', () => {
+    it('should throw an error if app is not passed in.', () => {
+      try {
+        uut.attach()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Must pass app object when attaching REST API controllers.'
+        )
+      }
+    })
+  })
+})

From e439d54413f36ca6f777f727dca641caae3a8c68 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 13 Jul 2021 08:57:57 -0700
Subject: [PATCH 42/43] linting

---
 config/passport.js                            | 49 ++++++------
 src/controllers/rest-api/contact/index.js     |  2 -
 src/controllers/rest-api/logs/index.js        | 48 ++++++++++--
 src/controllers/rest-api/logs/router.js       | 43 ----------
 .../logs.rest.controller.unit.js}             | 15 ++--
 .../rest-api/logs/logs.rest.router.unit.js    | 78 +++++++++++++++++++
 test/unit/misc/passport.unit.js               | 77 ++++++++++++++++++
 test/unit/mocks/adapters/index.js             |  4 +
 8 files changed, 236 insertions(+), 80 deletions(-)
 delete mode 100644 src/controllers/rest-api/logs/router.js
 rename test/unit/controllers/rest-api/{a06-logapi.rest-unit.js => logs/logs.rest.controller.unit.js} (77%)
 create mode 100644 test/unit/controllers/rest-api/logs/logs.rest.router.unit.js
 create mode 100644 test/unit/misc/passport.unit.js

diff --git a/config/passport.js b/config/passport.js
index 113ee03..1c07784 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -22,27 +22,32 @@ passport.use(
       usernameField: 'email',
       passwordField: 'password'
     },
-    async (email, password, done) => {
-      try {
-        const user = await User.findOne({ email })
-        if (!user) {
-          return done(null, false)
-        }
-
-        try {
-          const isMatch = await user.validatePassword(password)
-
-          if (!isMatch) {
-            return done(null, false)
-          }
-
-          done(null, user)
-        } catch (err) {
-          done(err)
-        }
-      } catch (err) {
-        return done(err)
-      }
-    }
+    passportCallback
   )
 )
+
+async function passportCallback (email, password, done) {
+  try {
+    const user = await User.findOne({ email })
+    if (!user) {
+      return done(null, false)
+    }
+
+    try {
+      const isMatch = await user.validatePassword(password)
+
+      if (!isMatch) {
+        return done(null, false)
+      }
+
+      done(null, user)
+    } catch (err) {
+      done(err)
+    }
+  } catch (err) {
+    return done(err)
+  }
+}
+
+// For testing
+module.exports = { passport, passportCallback }
diff --git a/src/controllers/rest-api/contact/index.js b/src/controllers/rest-api/contact/index.js
index e4db57a..c36daae 100644
--- a/src/controllers/rest-api/contact/index.js
+++ b/src/controllers/rest-api/contact/index.js
@@ -7,7 +7,6 @@ const Router = require('koa-router')
 
 // Local libraries.
 const ContactRESTControllerLib = require('./controller')
-const Validators = require('../middleware/validators')
 
 class ContactRouter {
   constructor (localConfig = {}) {
@@ -32,7 +31,6 @@ class ContactRouter {
 
     // Encapsulate dependencies.
     this.contactRESTController = new ContactRESTControllerLib(dependencies)
-    this.validators = new Validators()
 
     // Instantiate the router and set the base route.
     const baseUrl = '/contact'
diff --git a/src/controllers/rest-api/logs/index.js b/src/controllers/rest-api/logs/index.js
index c8544c2..334ca67 100644
--- a/src/controllers/rest-api/logs/index.js
+++ b/src/controllers/rest-api/logs/index.js
@@ -2,16 +2,54 @@
   REST API library for /logs route.
 */
 
-const LogsRESTRouter = require('./router')
+// Public npm libraries.
+const Router = require('koa-router')
 
-class LogsRESTController {
+// Local libraries.
+const LogsRESTControllerLib = require('./controller')
+
+class LogsRouter {
   constructor (localConfig = {}) {
-    this.logsRESTRouter = new LogsRESTRouter()
+    // Dependency Injection.
+    this.adapters = localConfig.adapters
+    if (!this.adapters) {
+      throw new Error(
+        'Instance of Adapters library required when instantiating Logs REST Controller.'
+      )
+    }
+    this.useCases = localConfig.useCases
+    if (!this.useCases) {
+      throw new Error(
+        'Instance of Use Cases library required when instantiating Logs REST Controller.'
+      )
+    }
+
+    const dependencies = {
+      adapters: this.adapters,
+      useCases: this.useCases
+    }
+
+    this.logsRESTController = new LogsRESTControllerLib(dependencies)
+
+    // Instantiate the router and set the base route.
+    const baseUrl = '/logs'
+    this.router = new Router({ prefix: baseUrl })
   }
 
   attach (app) {
-    this.logsRESTRouter.attachControllers(app)
+    if (!app) {
+      throw new Error(
+        'Must pass app object when attaching REST API controllers.'
+      )
+    }
+
+    // Define the routes and attach the controller.
+    this.router.post('/', this.logsRESTController.getLogs)
+
+    // Attach the Controller routes to the Koa app.
+    app.use(this.router.routes())
+    app.use(this.router.allowedMethods())
   }
 }
 
-module.exports = LogsRESTController
+module.exports = LogsRouter
diff --git a/src/controllers/rest-api/logs/router.js b/src/controllers/rest-api/logs/router.js
deleted file mode 100644
index d4b1ccf..0000000
--- a/src/controllers/rest-api/logs/router.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-  REST Router for the /logs route.
-*/
-
-// Public npm libraries.
-const Router = require('koa-router')
-
-// Local libraries.
-const LogsRESTControllerLib = require('./controller')
-const Validators = require('../middleware/validators')
-
-// let _this
-
-class LogsRESTRouter {
-  constructor (localConfig = {}) {
-    // Encapsulate dependencies.
-    this.logsRESTController = new LogsRESTControllerLib()
-    this.validators = new Validators()
-
-    // Instantiate the router and set the base route.
-    const baseUrl = '/logs'
-    this.router = new Router({ prefix: baseUrl })
-
-    // _this = this
-  }
-
-  attachControllers (app) {
-    if (!app) {
-      throw new Error(
-        'Must pass app object when attaching REST API controllers.'
-      )
-    }
-
-    // Define the routes and attach the controller.
-    this.router.post('/', this.logsRESTController.getLogs)
-
-    // Attach the Controller routes to the Koa app.
-    app.use(this.router.routes())
-    app.use(this.router.allowedMethods())
-  }
-}
-
-module.exports = LogsRESTRouter
diff --git a/test/unit/controllers/rest-api/a06-logapi.rest-unit.js b/test/unit/controllers/rest-api/logs/logs.rest.controller.unit.js
similarity index 77%
rename from test/unit/controllers/rest-api/a06-logapi.rest-unit.js
rename to test/unit/controllers/rest-api/logs/logs.rest.controller.unit.js
index f9ab138..ce181d1 100644
--- a/test/unit/controllers/rest-api/a06-logapi.rest-unit.js
+++ b/test/unit/controllers/rest-api/logs/logs.rest.controller.unit.js
@@ -6,12 +6,12 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const LogsApiController = require('../../../../src/controllers/rest-api/logs/controller')
+const LogsApiController = require('../../../../../src/controllers/rest-api/logs/controller')
 let uut
 let sandbox
 let ctx
 
-const mockContext = require('../../../unit/mocks/ctx-mock').context
+const mockContext = require('../../../../unit/mocks/ctx-mock').context
 
 describe('Logapi', () => {
   before(async () => {})
@@ -38,6 +38,7 @@ describe('Logapi', () => {
         assert.include(err.message, 'Cannot read property')
       }
     })
+
     it('should return 500 status on biz logic Unhandled error', async () => {
       try {
         // eslint-disable
@@ -59,18 +60,16 @@ describe('Logapi', () => {
     })
 
     it('should return 200 status on success', async () => {
+      // Mock dependencies
+      sandbox.stub(uut.logsApiLib, 'getLogs').resolves({})
+
       ctx.request.body = {
         password: 'test'
       }
 
       await uut.getLogs(ctx)
 
-      // Assert the expected HTTP response
-      assert.equal(ctx.status, 200)
-
-      // Assert that expected properties exist in the returned data.
-      assert.property(ctx.response.body, 'success')
-      assert.isTrue(ctx.response.body.success)
+      assert.isOk(ctx.body)
     })
   })
 })
diff --git a/test/unit/controllers/rest-api/logs/logs.rest.router.unit.js b/test/unit/controllers/rest-api/logs/logs.rest.router.unit.js
new file mode 100644
index 0000000..39f5a56
--- /dev/null
+++ b/test/unit/controllers/rest-api/logs/logs.rest.router.unit.js
@@ -0,0 +1,78 @@
+/*
+  Unit tests for the REST API handler for the /users endpoints.
+*/
+
+// Public npm libraries
+const assert = require('chai').assert
+const sinon = require('sinon')
+
+// Local support libraries
+const adapters = require('../../../mocks/adapters')
+const UseCasesMock = require('../../../mocks/use-cases')
+// const app = require('../../../mocks/app-mock')
+
+const LogsRouter = require('../../../../../src/controllers/rest-api/logs')
+let uut
+let sandbox
+// let ctx
+
+// const mockContext = require('../../../../unit/mocks/ctx-mock').context
+
+describe('#Contact-REST-Router', () => {
+  // const testUser = {}
+
+  beforeEach(() => {
+    const useCases = new UseCasesMock()
+    uut = new LogsRouter({ adapters, useCases })
+
+    sandbox = sinon.createSandbox()
+
+    // Mock the context object.
+    // ctx = mockContext()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#constructor', () => {
+    it('should throw an error if adapters are not passed in', () => {
+      try {
+        uut = new LogsRouter()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Adapters library required when instantiating Logs REST Controller.'
+        )
+      }
+    })
+
+    it('should throw an error if useCases are not passed in', () => {
+      try {
+        uut = new LogsRouter({ adapters })
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Instance of Use Cases library required when instantiating Logs REST Controller.'
+        )
+      }
+    })
+  })
+
+  describe('#attach', () => {
+    it('should throw an error if app is not passed in.', () => {
+      try {
+        uut.attach()
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.include(
+          err.message,
+          'Must pass app object when attaching REST API controllers.'
+        )
+      }
+    })
+  })
+})
diff --git a/test/unit/misc/passport.unit.js b/test/unit/misc/passport.unit.js
new file mode 100644
index 0000000..71f273f
--- /dev/null
+++ b/test/unit/misc/passport.unit.js
@@ -0,0 +1,77 @@
+/*
+  Unit tests for the passport library.
+*/
+
+// Public npm libraries
+// const assert = require('chai').assert
+const sinon = require('sinon')
+
+// Local libraries
+const User = require('../../../src/adapters/localdb/models/users')
+const { passport, passportCallback } = require('../../../config/passport')
+const adaptersMock = require('../mocks/adapters')
+
+describe('#passport', () => {
+  let sandbox
+  let id
+  let done
+
+  beforeEach(() => {
+    sandbox = sinon.createSandbox()
+
+    id = 'abc123'
+    done = () => {}
+  })
+
+  afterEach(() => sandbox.restore())
+
+  describe('#serializeUser', () => {
+    it('should serialize a user', () => {
+      const user = {
+        id: 'abc123'
+      }
+      const done = () => {}
+
+      passport.serializeUser(user, done)
+    })
+  })
+
+  describe('#deserializeUser', () => {
+    it('should deserialize a user', () => {
+      // Mock Users model.
+      sandbox.stub(User, 'findById').resolves({ id })
+
+      passport.deserializeUser(id, done)
+    })
+
+    it('should catch and handle errors', () => {
+      // Force an error
+      sandbox.stub(User, 'findById').rejects(new Error('test error'))
+
+      passport.deserializeUser(id, done)
+    })
+  })
+
+  describe('#passportCallback', () => {
+    it('should return if user is found', () => {
+      // Mock Users model.
+      sandbox.stub(User, 'findOne').resolves({ id })
+
+      passportCallback(id, 'password', done)
+    })
+
+    it('should return if password is validated', () => {
+      // Mock Users model.
+      sandbox.stub(User, 'findOne').resolves(new adaptersMock.localdb.Users())
+
+      passportCallback(id, 'password', done)
+    })
+
+    it('should catch a high-level error', () => {
+      // Force an error
+      sandbox.stub(User, 'findOne').rejects(new Error('test error'))
+
+      passportCallback(id, 'password', done)
+    })
+  })
+})
diff --git a/test/unit/mocks/adapters/index.js b/test/unit/mocks/adapters/index.js
index bdabe0b..aa84c05 100644
--- a/test/unit/mocks/adapters/index.js
+++ b/test/unit/mocks/adapters/index.js
@@ -36,6 +36,10 @@ const localdb = {
     async remove () {
       return true
     }
+
+    async validatePassword () {
+      return true
+    }
   },
 
   validatePassword: () => {

From cb90eb4a9b82d9554550b31508fc6f12d115dd2d Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 13 Jul 2021 09:09:42 -0700
Subject: [PATCH 43/43] Got 100% test coverage

---
 src/adapters/wlogger.js                       | 6 +++---
 test/unit/adapters/ipfs-index.adapter.unit.js | 4 ++--
 test/unit/adapters/ipfs.adapter.unit.js       | 4 ++--
 test/unit/use-cases/index.use-case.unit.js    | 4 ++--
 test/unit/use-cases/users.use-case.unit.js    | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/adapters/wlogger.js b/src/adapters/wlogger.js
index 1c284a3..3c78ffe 100644
--- a/src/adapters/wlogger.js
+++ b/src/adapters/wlogger.js
@@ -55,8 +55,8 @@ function outputToConsole () {
 }
 
 // This controls the logs to CONSOLE
-if (config.env !== 'test') {
-  outputToConsole()
-}
+// if (config.env !== 'test') {
+//   outputToConsole()
+// }
 
 module.exports = { wlogger, notifyRotation, outputToConsole }
diff --git a/test/unit/adapters/ipfs-index.adapter.unit.js b/test/unit/adapters/ipfs-index.adapter.unit.js
index 36190f4..1d46622 100644
--- a/test/unit/adapters/ipfs-index.adapter.unit.js
+++ b/test/unit/adapters/ipfs-index.adapter.unit.js
@@ -9,7 +9,7 @@ const IPFSLib = require('../../../src/adapters/ipfs')
 const IPFSMock = require('../mocks/ipfs-mock')
 const IPFSCoordMock = require('../mocks/ipfs-coord-mock')
 
-describe('#IPFS', () => {
+describe('#IPFS-adapter-index', () => {
   let uut
   let sandbox
 
@@ -41,7 +41,7 @@ describe('#IPFS', () => {
 
         assert.fail('Unexpected code path.')
       } catch (err) {
-        console.log(err)
+        // console.log(err)
         assert.include(err.message, 'test error')
       }
     })
diff --git a/test/unit/adapters/ipfs.adapter.unit.js b/test/unit/adapters/ipfs.adapter.unit.js
index 0a41200..05b10fc 100644
--- a/test/unit/adapters/ipfs.adapter.unit.js
+++ b/test/unit/adapters/ipfs.adapter.unit.js
@@ -8,7 +8,7 @@ const sinon = require('sinon')
 const IPFSLib = require('../../../src/adapters/ipfs/ipfs')
 const IPFSMock = require('../mocks/ipfs-mock')
 
-describe('#IPFS', () => {
+describe('#IPFS-adapter', () => {
   let uut
   let sandbox
 
@@ -42,7 +42,7 @@ describe('#IPFS', () => {
 
         assert.fail('Unexpected code path.')
       } catch (err) {
-        console.log(err)
+        // console.log(err)
         assert.include(err.message, 'test error')
       }
     })
diff --git a/test/unit/use-cases/index.use-case.unit.js b/test/unit/use-cases/index.use-case.unit.js
index 2bc4937..a3043d0 100644
--- a/test/unit/use-cases/index.use-case.unit.js
+++ b/test/unit/use-cases/index.use-case.unit.js
@@ -7,7 +7,7 @@ const assert = require('chai').assert
 const sinon = require('sinon')
 
 // Local support libraries
-const testUtils = require('../../utils/test-utils')
+// const testUtils = require('../../utils/test-utils')
 
 // Unit under test (uut)
 const UseCases = require('../../../src/use-cases')
@@ -19,7 +19,7 @@ describe('#use-cases', () => {
 
   before(async () => {
     // Delete all previous users in the database.
-    await testUtils.deleteAllUsers()
+    // await testUtils.deleteAllUsers()
   })
 
   beforeEach(() => {
diff --git a/test/unit/use-cases/users.use-case.unit.js b/test/unit/use-cases/users.use-case.unit.js
index 8260403..0ef372d 100644
--- a/test/unit/use-cases/users.use-case.unit.js
+++ b/test/unit/use-cases/users.use-case.unit.js
@@ -9,20 +9,20 @@ const assert = require('chai').assert
 const sinon = require('sinon')
 
 // Local support libraries
-const testUtils = require('../../utils/test-utils')
+// const testUtils = require('../../utils/test-utils')
 
 // Unit under test (uut)
 const UserLib = require('../../../src/use-cases/user')
 const adapters = require('../mocks/adapters')
 
-describe('#users', () => {
+describe('#users-use-case', () => {
   let uut
   let sandbox
   let testUser = {}
 
   before(async () => {
     // Delete all previous users in the database.
-    await testUtils.deleteAllUsers()
+    // await testUtils.deleteAllUsers()
   })
 
   beforeEach(() => {