@mojaloop/sdk-scheme-adapter 12.2.0 → 12.2.3

package/.env.example

@@ -141,7 +141,7 @@ ALLOW_TRANSFER_WITHOUT_QUOTE=false
 # To enable request for notification on fulfiled transfer
 RESERVE_NOTIFICATION=true
 
-# resources API versions should be string in format: "resouceOneName=1.0,resourceTwoName=1.1"
+# resources API versions should be string in format: "resourceOneName=1.0,resourceTwoName=1.1"
 RESOURCE_VERSIONS="transfers=1.1,participants=1.1"
 
 # Management API websocket connection settings.

package/CHANGELOG.md

@@ -1,4 +1,25 @@
 # Changelog: [mojaloop/thirdparty-api-svc](https://github.com/mojaloop/thirdparty-api-svc)
+### [12.2.3](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.2.2...v12.2.3) (2022-04-26)
+
+
+### Refactors
+
+* change config structure and remove unused code ([#311](https://github.com/mojaloop/sdk-scheme-adapter/issues/311)) ([c2e69e7](https://github.com/mojaloop/sdk-scheme-adapter/commit/c2e69e751daf7ad74ae213e8987946fdb84dd427))
+
+### [12.2.2](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.2.1...v12.2.2) (2022-04-22)
+
+
+### Bug Fixes
+
+* make management url config option optional ([#310](https://github.com/mojaloop/sdk-scheme-adapter/issues/310)) ([93c4048](https://github.com/mojaloop/sdk-scheme-adapter/commit/93c4048d5a604be81ce90365ff3f9cd42b531fef))
+
+### [12.2.1](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.2.0...v12.2.1) (2022-04-21)
+
+
+### Chore
+
+* **deps:** bump validator from 13.6.0 to 13.7.0 ([#309](https://github.com/mojaloop/sdk-scheme-adapter/issues/309)) ([3800820](https://github.com/mojaloop/sdk-scheme-adapter/commit/3800820b095fa86147189e836817c49b380b6814))
+
 ## [12.2.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.1.0...v12.2.0) (2022-04-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "12.2.0",
+  "version": "12.2.3",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -78,6 +78,7 @@
     "oauth2-server": "^4.0.0-dev.2",
     "openapi-jsonschema-parameters": "^9.3.0",
     "promise-timeout": "^1.3.0",
+    "random-word-slugs": "^0.1.6",
     "redis": "^3.1.2",
     "uuidv4": "^6.2.12",
     "ws": "^7.5.5"

package/src/ControlAgent/index.js

@@ -25,8 +25,7 @@
 const assert = require('assert').strict;
 const ws = require('ws');
 const jsonPatch = require('fast-json-patch');
-const randomPhrase = require('~/lib/randomphrase');
-
+const { generateSlug } = require('random-word-slugs');
 
 /**************************************************************************
  * The message protocol messages, verbs, and errors
@@ -75,7 +74,7 @@ const deserialise = (msg) => {
     });
 };
 
-const buildMsg = (verb, msg, data, id = randomPhrase()) => serialise({
+const buildMsg = (verb, msg, data, id = generateSlug(4)) => serialise({
     verb,
     msg,
     data,

package/src/ControlServer/index.js

@@ -26,8 +26,8 @@ const assert = require('assert').strict;
 
 const ws = require('ws');
 const jsonPatch = require('fast-json-patch');
+const { generateSlug } = require('random-word-slugs');
 
-const randomPhrase = require('~/lib/randomphrase');
 
 /**************************************************************************
  * The message protocol messages, verbs, and errors
@@ -76,7 +76,7 @@ const deserialise = (msg) => {
     });
 };
 
-const buildMsg = (verb, msg, data, id = randomPhrase()) => serialise({
+const buildMsg = (verb, msg, data, id = generateSlug(4)) => serialise({
     verb,
     msg,
     data,

package/src/InboundServer/index.js

@@ -35,7 +35,7 @@ class InboundApi extends EventEmitter {
             auth: new WSO2Auth({
                 ...conf.wso2.auth,
                 logger,
-                tlsCreds: conf.mutualTLS.outboundRequests.enabled && conf.mutualTLS.outboundRequests.creds,
+                tlsCreds: conf.inbound.tls.mutualTLS.enabled && conf.inbound.tls.creds,
             }),
             retryWso2AuthFailureTimes: conf.wso2.requestAuthFailureRetryTimes,
         };
@@ -160,8 +160,8 @@ class InboundServer extends EventEmitter {
             this.emit('error', ...args);
         });
         this._server = this._createServer(
-            conf.mutualTLS.inboundRequests.enabled,
-            conf.mutualTLS.inboundRequests.creds,
+            conf.inbound.tls.mutualTLS.enabled,
+            conf.inbound.tls.creds,
             this._api.callback()
         );
     }
@@ -172,8 +172,8 @@ class InboundServer extends EventEmitter {
         const apiSpecs = yaml.load(fs.readFileSync(specPath));
         await this._validator.initialise(apiSpecs);
         await this._api.start();
-        await new Promise((resolve) => this._server.listen(this._conf.inboundServerPort, resolve));
-        this._logger.log(`Serving inbound API on port ${this._conf.inboundServerPort}`);
+        await new Promise((resolve) => this._server.listen(this._conf.inbound.port, resolve));
+        this._logger.log(`Serving outbound API on port ${this._conf.inbound.port}`);
     }
 
     async stop() {
@@ -194,7 +194,7 @@ class InboundServer extends EventEmitter {
         // are subclasses of net.Server. This wasn't considered as a requirement at the time of
         // writing.
         assert(
-            this._conf.mutualTLS.inboundRequests.enabled === conf.mutualTLS.inboundRequests.enabled,
+            this._conf.inbound.tls.mutualTLS.enabled === conf.inbound.tls.mutualTLS.enabled,
             'Cannot live-restart an HTTPS server as HTTP or vice versa',
         );
         const newApi = new InboundApi(conf, logger, cache, this._validator);
@@ -207,7 +207,7 @@ class InboundServer extends EventEmitter {
                 conf.inbound.tls.creds,
                 this._conf.inbound.tls.creds
             );
-            if (this._conf.mutualTLS.inboundRequests.enabled && tlsCredsChanged) {
+            if (this._conf.inbound.tls.mutualTLS.enabled && tlsCredsChanged) {
                 this._server.setSecureContext(conf.inbound.tls.creds);
             }
             this._server.removeAllListeners('request');

package/src/InboundServer/middlewares.js

@@ -10,7 +10,7 @@
 
 const coBody = require('co-body');
 
-const randomPhrase = require('../lib/randomphrase');
+const { generateSlug } = require('random-word-slugs');
 const { Jws, Errors } = require('@mojaloop/sdk-standard-components');
 const {
     parseAcceptHeader,
@@ -157,7 +157,7 @@ const cacheRequest = (cache) => async (ctx, next) => {
  * @return {Function}
  */
 const createRequestIdGenerator = () => async (ctx, next) => {
-    ctx.request.id = randomPhrase();
+    ctx.request.id = generateSlug(4);
     await next();
 };
 

package/src/OutboundServer/index.js

@@ -39,7 +39,7 @@ class OutboundApi extends EventEmitter {
             auth: new WSO2Auth({
                 ...this._conf.wso2.auth,
                 logger: this._logger,
-                tlsCreds: this._conf.mutualTLS.outboundRequests.enabled && this._conf.mutualTLS.outboundRequests.creds,
+                tlsCreds: this._conf.outbound.tls.mutualTLS.enabled && this._conf.outbound.tls.creds,
             }),
             retryWso2AuthFailureTimes: conf.wso2.requestAuthFailureRetryTimes,
         };
@@ -67,7 +67,7 @@ class OutboundApi extends EventEmitter {
                 proxyConfig: conf.proxyConfig,
                 logger: this._logger,
                 wso2Auth: this._wso2.auth,
-                tls: conf.mutualTLS.outboundRequests,
+                tls: conf.outbound.tls,
             }));
         }
 
@@ -111,14 +111,11 @@ class OutboundServer extends EventEmitter {
 
     async start() {
         await this._api.start();
-
         const specPath = path.join(__dirname, 'api.yaml');
         const apiSpecs = yaml.load(fs.readFileSync(specPath));
         await this._validator.initialise(apiSpecs);
-
-        await new Promise((resolve) => this._server.listen(this._conf.outboundServerPort, resolve));
-
-        this._logger.log(`Serving outbound API on port ${this._conf.outboundServerPort}`);
+        await new Promise((resolve) => this._server.listen(this._conf.outbound.port, resolve));
+        this._logger.log(`Serving outbound API on port ${this._conf.outbound.port}`);
     }
 
     async stop() {

package/src/config.js

@@ -22,8 +22,8 @@ function getFileContent (path) {
 }
 
 /**
-     * Gets Resources versions from enviromental variable RESOURCES_VERSIONS
-     * should be string in format: "resouceOneName=1.0,resourceTwoName=1.1"
+     * Gets Resources versions from environmental variable RESOURCES_VERSIONS
+     * should be string in format: "resourceOneName=1.0,resourceTwoName=1.1"
      */
 function getVersionFromConfig (resourceString) {
     const resourceVersionMap = {};
@@ -44,7 +44,7 @@ function parseResourceVersions (resourceString) {
     const resourceFormatRegex = /(([A-Za-z])\w*)=([0-9]+).([0-9]+)([^;:|],*)/g;
     const noSpResources = resourceString.replace(/\s/g,'');
     if (!resourceFormatRegex.test(noSpResources)) {
-        throw new Error('Resource versions format should be in format: "resouceOneName=1.0,resourceTwoName=1.1"');
+        throw new Error('Resource versions format should be in format: "resourceOneName=1.0,resourceTwoName=1.1"');
     }
     return getVersionFromConfig(noSpResources);
 }
@@ -59,20 +59,28 @@ const env = from(process.env, {
 module.exports = {
     __parseResourceVersion: parseResourceVersions,
     control: {
-        mgmtAPIWsUrl: env.get('MGMT_API_WS_URL').required().asString(),
+        mgmtAPIWsUrl: env.get('MGMT_API_WS_URL').default('127.0.0.1').asString(),
         mgmtAPIWsPort: env.get('MGMT_API_WS_PORT').default('4005').asPortNumber()
     },
-    mutualTLS: {
-        inboundRequests: {
-            enabled: env.get('INBOUND_MUTUAL_TLS_ENABLED').default('false').asBool(),
+    inbound: {
+        port: env.get('INBOUND_LISTEN_PORT').default('4000').asPortNumber(),
+        tls: {
+            mutualTLS: {
+                enabled: env.get('INBOUND_MUTUAL_TLS_ENABLED').default('false').asBool(),
+            },
             creds: {
                 ca: env.get('IN_CA_CERT_PATH').asFileListContent(),
                 cert: env.get('IN_SERVER_CERT_PATH').asFileContent(),
                 key: env.get('IN_SERVER_KEY_PATH').asFileContent(),
             },
         },
-        outboundRequests: {
-            enabled: env.get('OUTBOUND_MUTUAL_TLS_ENABLED').default('false').asBool(),
+    },
+    outbound: {
+        port: env.get('OUTBOUND_LISTEN_PORT').default('4001').asPortNumber(),
+        tls: {
+            mutualTLS: {
+                enabled: env.get('OUTBOUND_MUTUAL_TLS_ENABLED').default('false').asBool(),
+            },
             creds: {
                 ca: env.get('OUT_CA_CERT_PATH').asFileListContent(),
                 cert: env.get('OUT_CLIENT_CERT_PATH').asFileContent(),
@@ -80,9 +88,9 @@ module.exports = {
             },
         },
     },
-    inboundServerPort: env.get('INBOUND_LISTEN_PORT').default('4000').asPortNumber(),
-    outboundServerPort: env.get('OUTBOUND_LISTEN_PORT').default('4001').asPortNumber(),
-    testServerPort: env.get('TEST_LISTEN_PORT').default('4002').asPortNumber(),
+    test: {
+        port: env.get('TEST_LISTEN_PORT').default('4002').asPortNumber(),
+    },
     peerEndpoint: env.get('PEER_ENDPOINT').required().asString(),
     alsEndpoint: env.get('ALS_ENDPOINT').asString(),
     quotesEndpoint: env.get('QUOTES_ENDPOINT').asString(),
@@ -97,6 +105,9 @@ module.exports = {
     checkIlp: env.get('CHECK_ILP').default('true').asBool(),
     expirySeconds: env.get('EXPIRY_SECONDS').default('60').asIntPositive(),
 
+    multiplePartiesResponse: env.get('MULTIPLE_PARTIES_RESPONSE').default('false').asBool(),
+    multiplePartiesResponseSeconds: env.get('MULTIPLE_PARTIES_RESPONSE_SECONDS').default('30').asIntPositive(),
+
     autoAcceptQuotes: env.get('AUTO_ACCEPT_QUOTES').default('true').asBool(),
     autoAcceptParty: env.get('AUTO_ACCEPT_PARTY').default('true').asBool(),
     autoAcceptR2PBusinessQuotes: env.get('AUTO_ACCEPT_R2P_BUSINESS_QUOTES').default('false').asBool(),
@@ -157,13 +168,19 @@ module.exports = {
 
     proxyConfig: env.get('PROXY_CONFIG_PATH').asYamlConfig(),
     reserveNotification: env.get('RESERVE_NOTIFICATION').default('false').asBool(),
-    // resourceVersions config should be string in format: "resouceOneName=1.0,resourceTwoName=1.1"
+    sendFinalNotificationIfRequested: env.get('SEND_FINAL_NOTIFICATION_IF_REQUESTED').default('false').asBool(),
+
+    // resourceVersions config should be string in format: "resourceOneName=1.0,resourceTwoName=1.1"
     resourceVersions: env.get('RESOURCE_VERSIONS').default('').asResourceVersions(),
 
+    metrics: {
+        port: env.get('METRICS_SERVER_LISTEN_PORT').default('4004').asPortNumber()
+    },
+
     // in 3PPI DFSP's generate their own `transferId` which is associated with
     // a transactionRequestId. this option decodes the ilp packet for
     // the `transactionId` to retrieve the quote from cache
     allowDifferentTransferTransactionId: env.get('ALLOW_DIFFERENT_TRANSFER_TRANSACTION_ID').default('false').asBool(),
 
-    pm4mlEnabled: env.get('PM4ML_ENABLED').default('false').asBool(),
+    pm4mlEnabled: env.get('PM4ML_ENABLED').default('false').asBool()
 };

package/src/index.js

@@ -25,7 +25,6 @@ const InboundServerMiddleware = require('./InboundServer/middlewares.js');
 const OutboundServerMiddleware = require('./OutboundServer/middlewares.js');
 const Router = require('./lib/router');
 const Validate = require('./lib/validate');
-const RandomPhrase = require('./lib/randomphrase');
 const Cache = require('./lib/cache');
 const { Logger } = require('@mojaloop/sdk-standard-components');
 
@@ -142,7 +141,6 @@ module.exports = {
     Cache,
     InboundServerMiddleware,
     OutboundServerMiddleware,
-    RandomPhrase,
     Router,
     Server,
     Validate,

package/src/lib/model/AccountsModel.js

@@ -36,7 +36,10 @@ class AccountsModel {
             logger: this._logger,
             peerEndpoint: config.alsEndpoint,
             dfspId: config.dfspId,
-            tls: config.tls,
+            tls: {
+                enabled: config.outbound.tls.mutualTLS.enabled,
+                creds: config.outbound.tls.creds,
+            },
             jwsSign: config.jwsSign,
             jwsSigningKey: config.jwsSigningKey,
             wso2: config.wso2,

package/src/lib/model/Async2SyncModel.js

@@ -228,7 +228,10 @@ function generate({
                         transfersEndpoint: config.transfersEndpoint,
                         transactionRequestsEndpoint: config.transactionRequestsEndpoint,
                         dfspId: config.dfspId,
-                        tls: config.tls,
+                        tls: {
+                            enabled: config.outbound.tls.mutualTLS.enabled,
+                            creds: config.outbound.tls.creds,
+                        },
                         jwsSign: config.jwsSign,
                         jwsSignPutParties: config.jwsSignPutParties,
                         jwsSigningKey: config.jwsSigningKey,

package/src/lib/model/InboundTransfersModel.js

@@ -46,7 +46,10 @@ class InboundTransfersModel {
             transactionRequestsEndpoint: config.transactionRequestsEndpoint,
             bulkQuotesEndpoint: config.bulkQuotesEndpoint,
             dfspId: config.dfspId,
-            tls: config.tls,
+            tls: {
+                enabled: config.outbound.tls.mutualTLS.enabled,
+                creds: config.outbound.tls.creds,
+            },
             jwsSign: config.jwsSign,
             jwsSigningKey: config.jwsSigningKey,
             wso2: config.wso2,

package/src/lib/model/OutboundBulkQuotesModel.js

@@ -40,7 +40,10 @@ class OutboundBulkQuotesModel {
             peerEndpoint: config.peerEndpoint,
             bulkQuotesEndpoint: config.bulkQuotesEndpoint,
             dfspId: config.dfspId,
-            tls: config.tls,
+            tls: {
+                enabled: config.outbound.tls.mutualTLS.enabled,
+                creds: config.outbound.tls.creds,
+            },
             jwsSign: config.jwsSign,
             jwsSigningKey: config.jwsSigningKey,
             wso2: config.wso2,

package/src/lib/model/OutboundBulkTransfersModel.js

@@ -38,7 +38,10 @@ class OutboundBulkTransfersModel {
             peerEndpoint: config.peerEndpoint,
             bulkTransfersEndpoint: config.bulkTransfersEndpoint,
             dfspId: config.dfspId,
-            tls: config.tls,
+            tls: {
+                enabled: config.outbound.tls.mutualTLS.enabled,
+                creds: config.outbound.tls.creds,
+            },
             jwsSign: config.jwsSign,
             jwsSignPutParties: config.jwsSignPutParties,
             jwsSigningKey: config.jwsSigningKey,

package/src/lib/model/OutboundRequestToPayModel.js

@@ -39,7 +39,10 @@ class OutboundRequestToPayModel {
             peerEndpoint: config.peerEndpoint,
             alsEndpoint: config.alsEndpoint,
             dfspId: config.dfspId,
-            tls: config.tls,
+            tls: {
+                enabled: config.outbound.tls.mutualTLS.enabled,
+                creds: config.outbound.tls.creds,
+            },
             jwsSign: config.jwsSign,
             jwsSignPutParties: config.jwsSignPutParties,
             jwsSigningKey: config.jwsSigningKey,

package/src/lib/model/OutboundRequestToPayTransferModel.js

@@ -52,7 +52,10 @@ class OutboundRequestToPayTransferModel {
             authorizationsEndpoint: config.authorizationsEndpoint,
             transfersEndpoint: config.transfersEndpoint,
             dfspId: config.dfspId,
-            tls: config.tls,
+            tls: {
+                enabled: config.outbound.tls.mutualTLS.enabled,
+                creds: config.outbound.tls.creds,
+            },
             jwsSign: config.jwsSign,
             jwsSignPutParties: config.jwsSignPutParties,
             jwsSigningKey: config.jwsSigningKey,

package/src/lib/model/OutboundTransfersModel.js

@@ -51,7 +51,10 @@ class OutboundTransfersModel {
             transfersEndpoint: config.transfersEndpoint,
             transactionRequestsEndpoint: config.transactionRequestsEndpoint,
             dfspId: config.dfspId,
-            tls: config.tls,
+            tls: {
+                enabled: config.outbound.tls.mutualTLS.enabled,
+                creds: config.outbound.tls.creds,
+            },
             jwsSign: config.jwsSign,
             jwsSignPutParties: config.jwsSignPutParties,
             jwsSigningKey: config.jwsSigningKey,

package/src/lib/model/ProxyModel/index.js

@@ -35,8 +35,10 @@ class ProxyModel {
         this._requests = new MojaloopRequests({
             logger: this._logger,
             peerEndpoint: config.peerEndpoint,
-            dfspId: config.dfspId,
-            tls: config.tls,
+            tls: {
+                enabled: config.outbound.tls.mutualTLS.enabled,
+                creds: config.outbound.tls.creds,
+            },
             jwsSign: config.jwsSign,
             jwsSigningKey: config.jwsSigningKey,
             wso2Auth: config.wso2Auth

package/src/lib/validate.js

@@ -24,7 +24,7 @@ const { Errors } = require('@mojaloop/sdk-standard-components');
 const Ajv = require('ajv');
 const ajv = new Ajv({ allErrors: true, coerceTypes: true, strict: false });
 
-const httpMethods = ['get', 'head', 'post', 'put', 'delete', 'connnect', 'options', 'trace', 'patch'];
+const httpMethods = ['get', 'head', 'post', 'put', 'delete', 'connect', 'options', 'trace', 'patch'];
 
 // Create a json schema in the format we've chosen to use
 const createSchema = (pathValue, methodValue) => {
@@ -186,7 +186,7 @@ class Validator {
 
             if(firstError.keyword === 'required') {
                 // this is a missing required property; there is a specific mojaloop api spec error code for this
-                err = new Errors.MojaloopFSPIOPError(firstError, util.format('Request failed validation', 
+                err = new Errors.MojaloopFSPIOPError(firstError, util.format('Request failed validation',
                     validationResult), null, Errors.MojaloopApiErrorCodes.MISSING_ELEMENT);
 
                 // overwrite the defaul error message with something more useful

package/test/config/integration.env

@@ -132,6 +132,11 @@ TRANSFERS_ENDPOINT=ml-testing-toolkit:5000
 # The fulfilment will be generated from the provided ILP packet, and must hash to the provided condition.
 ALLOW_TRANSFER_WITHOUT_QUOTE=false
 
+# To enable request for notification on fulfiled transfer
+RESERVE_NOTIFICATION=true
+# resources API versions should be string in format: "resourceOneName=1.0,resourceTwoName=1.1"
+RESOURCE_VERSIONS="transfers=1.1,participants=1.1"
+
 # Management API websocket connection settings.
 # The Management API uses this for exchanging connector management messages.
 MGMT_API_WS_URL=127.0.0.1

package/test/unit/ControlServer/index.js

@@ -11,7 +11,7 @@
 
 const ws = require('ws');
 const jsonPatch = require('fast-json-patch');
-const randomPhrase = require('~/lib/randomphrase');
+const { generateSlug } = require('random-word-slugs');
 const { getInternalEventEmitter, INTERNAL_EVENTS } = require('./events');
 
 const ControlServerEventEmitter = getInternalEventEmitter();
@@ -58,7 +58,7 @@ const deserialise = (msg) => {
 };
 
 
-const buildMsg = (verb, msg, data, id = randomPhrase()) => serialise({
+const buildMsg = (verb, msg, data, id = generateSlug(4)) => serialise({
     verb,
     msg,
     data,
@@ -197,7 +197,7 @@ class Server extends ws.Server {
      * @param {object} params Updated configuration
      */
     async broadcastConfigChange(updatedConfig) {
-        const updateConfMsg = build.CONFIGURATION.PATCH({}, updatedConfig, randomPhrase());
+        const updateConfMsg = build.CONFIGURATION.PATCH({}, updatedConfig, generateSlug(4));
         const errorLogger = (socket, message) => (err) =>
             this._logger
                 .push({ message, ip: this._clientData.get(socket).ip, err })

package/test/unit/InboundServer.test.js

@@ -334,7 +334,7 @@ describe('Inbound Server', () => {
         });
 
         async function testTlsServer(enableTls) {
-            defConfig.mutualTLS.inboundRequests.enabled = enableTls;
+            defConfig.inbound.tls.mutualTLS.enabled = enableTls;
             const logger = new Logger.Logger({ stringify: () => '' });
             const cache = new Cache({ ...defConfig.cacheConfig, logger: logger.push({ component: 'cache' }) });
             const server = new InboundServer(defConfig, logger, cache);

package/test/unit/config.test.js

@@ -68,7 +68,7 @@ describe('config', () => {
         fs.writeFileSync(cert, certContent);
         process.env.IN_SERVER_CERT_PATH = cert;
         const config = require('~/config');
-        const content = config.mutualTLS.inboundRequests.creds.cert.toString();
+        const content = config.inbound.tls.creds.cert.toString();
         expect(content).toBe(certContent);
     });
 
@@ -84,7 +84,7 @@ describe('config', () => {
         certs.forEach((cert, index) => fs.writeFileSync(cert, certContent[index]));
         process.env.IN_CA_CERT_PATH = certs.join(',');
         const config = require('~/config');
-        const content = config.mutualTLS.inboundRequests.creds.ca.map(ca => ca.toString());
+        const content = config.inbound.tls.creds.ca.map(ca => ca.toString());
         expect(content).toStrictEqual(certContent);
     });
 
@@ -114,7 +114,7 @@ describe('config', () => {
 
     it('should throw an err if the resource string is not correctly formed', () => {
         const parseResourceVersion = require('~/config').__parseResourceVersion;
-        expect(() => parseResourceVersion('resourceOneName=1.0;resourceTwoName=1.1')).toThrowError(new Error('Resource versions format should be in format: "resouceOneName=1.0,resourceTwoName=1.1"'));
+        expect(() => parseResourceVersion('resourceOneName=1.0;resourceTwoName=1.1')).toThrowError(new Error('Resource versions format should be in format: "resourceOneName=1.0,resourceTwoName=1.1"'));
     });
 
 });

package/test/unit/data/defaultConfig.json

@@ -1,15 +1,28 @@
 {
-  "mutualTLS": {
-    "inboundRequests": {
-      "enabled": false,
+  "control": {},
+  "test": {
+    "tls": {
+      "mutualTLS": { "enabled": false },
       "creds": {
         "ca": null,
         "cert": null,
         "key": null
       }
-    },
-    "outboundRequests": {
-      "enabled": false,
+    }
+  },
+  "inbound": {
+    "tls": {
+      "mutualTLS": { "enabled": false },
+      "creds": {
+        "ca": null,
+        "cert": null,
+        "key": null
+      }
+    }
+  },
+  "outbound": {
+    "tls": {
+      "mutualTLS": { "enabled": false },
       "creds": {
         "ca": null,
         "cert": null,
@@ -54,5 +67,8 @@
   "rejectExpiredQuoteResponses": false,
   "rejectExpiredTransferFulfils": false,
   "rejectTransfersOnExpiredQuotes": false,
-  "logIndent": 2
+  "logIndent": 2,
+  "metrics": {
+    "port": 4004
+  }
 }

package/test/unit/index.test.js

@@ -50,7 +50,6 @@ describe('index.js', () => {
         expect(typeof(index.OutboundServerMiddleware)).toBe('object');
         expect(typeof(index.Router)).toBe('function');
         expect(typeof(index.Validate)).toBe('function');
-        expect(typeof(index.RandomPhrase)).toBe('function');
         expect(typeof(index.Cache)).toBe('function');
     });
 });

package/test/unit/lib/model/OutboundTransfersModel.test.js

@@ -849,7 +849,7 @@ describe('outboundModel', () => {
 
 
     async function testTlsServer(enableTls) {
-        config.tls.enabled = enableTls;
+        config.outbound.tls.mutualTLS.enabled = enableTls;
 
         new Model({
             cache,

package/test/unit/lib/model/data/defaultConfig.json

@@ -1,14 +1,26 @@
 {
-  "tls": {
-    "enabled": false,
-    "creds": {
-      "ca": null,
-      "cert": null,
-      "key": null
+  "inbound": {
+    "port": 4000,
+    "tls": {
+        "mutualTLS": { "enabled": false },
+        "creds": {
+            "ca": null,
+            "cert": null,
+            "key": null
+        }
     }
   },
-  "inboundServerPort": 4000,
-  "outboundServerPort": 4001,
+  "outbound": {
+      "port": 4001,
+      "tls": {
+          "mutualTLS": { "enabled": false },
+          "creds": {
+              "ca": null,
+              "cert": null,
+              "key": null
+          }
+      }
+  },
   "peerEndpoint": "172.17.0.2:3001",
   "backendEndpoint": "172.17.0.2:3001",
   "alsEndpoint": "127.0.0.1:6500",
@@ -43,5 +55,8 @@
   "rejectExpiredQuoteResponses": false,
   "rejectExpiredTransferFulfils": false,
   "rejectTransfersOnExpiredQuotes": false,
-  "logIndent": 2
+  "logIndent": 2,
+  "metrics": {
+    "port": 4004
+  }
 }

package/src/lib/api/index.js

@@ -1,12 +0,0 @@
-class ApiServer {
-    constructor(conf) {
-        this.conf = conf;
-        this.api = null;
-        this.server = null;
-        this.logger = null;
-    }
-
-
-}
-
-module.exports = ApiServer;