From 2ce2876f046173b06d93e07159b262ef0a353677 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sat, 11 Apr 2020 17:44:31 +0200
Subject: [PATCH] Refactor

---
 lib/controller.js                       |  2 +-
 lib/extension/{ => legacy}/softReset.js |  8 ++++----
 test/{ => legacy}/bridgeLegacy.test.js  | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename lib/extension/{ => legacy}/softReset.js (89%)
 rename test/{ => legacy}/bridgeLegacy.test.js (98%)

diff --git a/lib/controller.js b/lib/controller.js
index e50cf2bef..8bf9955f3 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -11,7 +11,7 @@ const utils = require('./util/utils');
 const ExtensionEntityPublish = require('./extension/entityPublish');
 const ExtensionDeviceReceive = require('./extension/deviceReceive');
 const ExtensionNetworkMap = require('./extension/networkMap');
-const ExtensionSoftReset = require('./extension/softReset');
+const ExtensionSoftReset = require('./extension/legacy/softReset');
 const ExtensionHomeAssistant = require('./extension/homeassistant');
 const ExtensionDeviceConfigure = require('./extension/deviceConfigure');
 const ExtensionDeviceGroupMembership = require('./extension/legacy/deviceGroupMembership');
diff --git a/lib/extension/softReset.js b/lib/extension/legacy/softReset.js
similarity index 89%
rename from lib/extension/softReset.js
rename to lib/extension/legacy/softReset.js
index 800d128f2..5701bdce0 100644
--- a/lib/extension/softReset.js
+++ b/lib/extension/legacy/softReset.js
@@ -1,9 +1,9 @@
 /* istanbul ignore file */
 // DEPRECATED
-const settings = require('../util/settings');
-const logger = require('../util/logger');
-const utils = require('../util/utils');
-const BaseExtension = require('./baseExtension');
+const settings = require('../../util/settings');
+const logger = require('../../util/logger');
+const utils = require('../../util/utils');
+const BaseExtension = require('../baseExtension');
 
 /**
  * This extensions soft resets the ZNP after a certain timeout.
diff --git a/test/bridgeLegacy.test.js b/test/legacy/bridgeLegacy.test.js
similarity index 98%
rename from test/bridgeLegacy.test.js
rename to test/legacy/bridgeLegacy.test.js
index d405d903e..cfdb96132 100644
--- a/test/bridgeLegacy.test.js
+++ b/test/legacy/bridgeLegacy.test.js
@@ -1,11 +1,11 @@
-const data = require('./stub/data');
-const logger = require('./stub/logger');
-const zigbeeHerdsman = require('./stub/zigbeeHerdsman');
-const MQTT = require('./stub/mqtt');
+const data = require('../stub/data');
+const logger = require('../stub/logger');
+const zigbeeHerdsman = require('../stub/zigbeeHerdsman');
+const MQTT = require('../stub/mqtt');
 const path = require('path');
 const mockExit = jest.spyOn(process, 'exit').mockImplementation(() => {});
-const settings = require('../lib/util/settings');
-const Controller = require('../lib/controller');
+const settings = require('../../lib/util/settings');
+const Controller = require('../../lib/controller');
 const flushPromises = () => new Promise(setImmediate);
 
 
@@ -13,7 +13,7 @@ describe('Bridge legacy', () => {
     let controller;
 
     beforeAll(async () => {
-        this.version = await require('../lib/util/utils').getZigbee2mqttVersion();
+        this.version = await require('../../lib/util/utils').getZigbee2mqttVersion();
         controller = new Controller();
         await controller.start();
     })