Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into patchopensnapps

js/modules/loki_file_server_api.js

@@ -4,7 +4,6 @@
 /* global log: false */
 
 const LokiAppDotNetAPI = require('./loki_app_dot_net_api');
-const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js');
 
 const DEVICE_MAPPING_USER_ANNOTATION_TYPE =
   'network.loki.messenger.devicemapping';
@@ -60,6 +59,8 @@ class LokiFileServerInstance {
   async establishConnection(serverUrl, options) {
     // why don't we extend this?
     if (process.env.USE_STUBBED_NETWORK) {
+      // eslint-disable-next-line global-require
+      const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js');
       this._server = new StubAppDotNetAPI(this.ourKey, serverUrl);
     } else {
       this._server = new LokiAppDotNetAPI(this.ourKey, serverUrl);

js/modules/loki_public_chat_api.js

@@ -2,7 +2,6 @@
 const EventEmitter = require('events');
 const nodeFetch = require('node-fetch');
 const LokiAppDotNetAPI = require('./loki_app_dot_net_api');
-const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js');
 
 class LokiPublicChatFactoryAPI extends EventEmitter {
   constructor(ourKey) {
@@ -61,6 +60,8 @@ class LokiPublicChatFactoryAPI extends EventEmitter {
 
       // after verification then we can start up all the pollers
       if (process.env.USE_STUBBED_NETWORK) {
+        // eslint-disable-next-line global-require
+        const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js');
         thisServer = new StubAppDotNetAPI(this.ourKey, serverUrl);
       } else {
         thisServer = new LokiAppDotNetAPI(this.ourKey, serverUrl);