Get rid of defaultTunnelStateTransition and defaultSettings methods

4 files changed, 24 insertions, 46 deletions

diff --git a/gui/packages/desktop/src/main/daemon-rpc.js b/gui/packages/desktop/src/main/daemon-rpc.js
index e3096dfef1..5064af6ba8 100644
--- a/gui/packages/desktop/src/main/daemon-rpc.js
+++ b/gui/packages/desktop/src/main/daemon-rpc.js
@@ -638,28 +638,3 @@ function transformObjectKeys(object: Object, keyTransformer: (string) => string)
   }
   return object;
 }
-
-export function defaultSettings(): Settings {
-  return {
-    accountToken: null,
-    allowLan: false,
-    autoConnect: false,
-    relaySettings: {
-      normal: {
-        location: 'any',
-        tunnel: 'any',
-      },
-    },
-    tunnelOptions: {
-      enableIpv6: false,
-      openvpn: {
-        mssfix: null,
-      },
-      proxy: null,
-    },
-  };
-}
-
-export function defaultTunnelStateTransition(): TunnelStateTransition {
-  return { state: 'disconnected' };
-}
diff --git a/gui/packages/desktop/src/main/index.js b/gui/packages/desktop/src/main/index.js
index 3b2759380d..77938d3825 100644
--- a/gui/packages/desktop/src/main/index.js
+++ b/gui/packages/desktop/src/main/index.js
@@ -16,13 +16,7 @@ import type { TrayIconType } from './tray-icon-controller';
 
 import IpcEventChannel from '../shared/ipc-event-channel';
 
-import {
-  DaemonRpc,
-  ConnectionObserver,
-  SubscriptionListener,
-  defaultSettings,
-  defaultTunnelStateTransition,
-} from './daemon-rpc';
+import { DaemonRpc, ConnectionObserver, SubscriptionListener } from './daemon-rpc';
 import type {
   AppVersionInfo,
   Location,
@@ -68,8 +62,25 @@ const ApplicationMain = {
   _oldLogFilePath: (null: ?string),
   _quitStage: ('unready': AppQuitStage),
 
-  _tunnelState: defaultTunnelStateTransition(),
-  _settings: defaultSettings(),
+  _tunnelState: ({ state: 'disconnected' }: TunnelStateTransition),
+  _settings: ({
+    accountToken: null,
+    allowLan: false,
+    autoConnect: false,
+    relaySettings: {
+      normal: {
+        location: 'any',
+        tunnel: 'any',
+      },
+    },
+    tunnelOptions: {
+      enableIpv6: false,
+      openvpn: {
+        mssfix: null,
+      },
+      proxy: null,
+    },
+  }: Settings),
   _location: (null: ?Location),
 
   _relays: ({ countries: [] }: RelayList),
diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js
index c53eb2160b..a0529d6390 100644
--- a/gui/packages/desktop/src/renderer/app.js
+++ b/gui/packages/desktop/src/renderer/app.js
@@ -37,10 +37,7 @@ import type {
   TunnelStateTransition,
 } from './lib/daemon-rpc-proxy';
 
-import DaemonRpcProxy, {
-  defaultSettings,
-  defaultTunnelStateTransition,
-} from './lib/daemon-rpc-proxy';
+import DaemonRpcProxy from './lib/daemon-rpc-proxy';
 
 import type { ReduxStore } from './redux/store';
 
@@ -59,8 +56,8 @@ export default class AppRenderer {
     },
   );
 
-  _tunnelState = defaultTunnelStateTransition();
-  _settings = defaultSettings();
+  _tunnelState: TunnelStateTransition;
+  _settings: Settings;
   _connectedToDaemon = false;
 
   constructor() {
diff --git a/gui/packages/desktop/src/renderer/lib/daemon-rpc-proxy.js b/gui/packages/desktop/src/renderer/lib/daemon-rpc-proxy.js
index b3d326a5a6..5b928c8989 100644
--- a/gui/packages/desktop/src/renderer/lib/daemon-rpc-proxy.js
+++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc-proxy.js
@@ -28,12 +28,7 @@ export type {
   DaemonRpcProtocol,
 } from '../../main/daemon-rpc';
 
-export {
-  ConnectionObserver,
-  SubscriptionListener,
-  defaultSettings,
-  defaultTunnelStateTransition,
-} from '../../main/daemon-rpc';
+export { ConnectionObserver, SubscriptionListener } from '../../main/daemon-rpc';
 
 import type {
   AccountToken,