diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-10-16 13:07:19 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-10-16 13:07:19 +0200 |
| commit | df82d69eaa8b144c53d333827ba35937b16fdda1 (patch) | |
| tree | 0103d96890689892d62da1367429251a78d76c4b | |
| parent | cc30828ab19e990a17974bf6c23c0b7488b04ca8 (diff) | |
| parent | 63b717582a45177fc8b8cf3ea5f8e828e5a7b07f (diff) | |
| download | mullvadvpn-df82d69eaa8b144c53d333827ba35937b16fdda1.tar.xz mullvadvpn-df82d69eaa8b144c53d333827ba35937b16fdda1.zip | |
Merge branch 'cleanup-ipv4addr-exit'
| -rw-r--r-- | gui/packages/desktop/src/renderer/lib/daemon-rpc.js | 3 | ||||
| -rw-r--r-- | gui/packages/desktop/test/components/SelectLocation.spec.js | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js index 40f57ce856..572954b26b 100644 --- a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js +++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js @@ -187,7 +187,6 @@ export type RelayListCity = { export type RelayListHostname = { hostname: string, ipv4AddrIn: string, - ipv4AddrExit: string, includeInCountry: boolean, weight: number, }; @@ -312,7 +311,7 @@ export class SubscriptionListener<T> { } export type Settings = { - accountToken: AccountToken, + accountToken: ?AccountToken, allowLan: boolean, autoConnect: boolean, relaySettings: RelaySettings, diff --git a/gui/packages/desktop/test/components/SelectLocation.spec.js b/gui/packages/desktop/test/components/SelectLocation.spec.js index f4aaf83ba1..b8bb8991c8 100644 --- a/gui/packages/desktop/test/components/SelectLocation.spec.js +++ b/gui/packages/desktop/test/components/SelectLocation.spec.js @@ -30,14 +30,12 @@ describe('components/SelectLocation', () => { { hostname: 'fake1.mullvad.net', ipv4AddrIn: '192.168.0.100', - ipv4AddrExit: '192.168.1.100', includeInCountry: true, weight: 1, }, { hostname: 'fake2.mullvad.net', ipv4AddrIn: '192.168.0.101', - ipv4AddrExit: '192.168.1.101', includeInCountry: true, weight: 1, }, @@ -53,7 +51,6 @@ describe('components/SelectLocation', () => { { hostname: 'fake2.mullvad.net', ipv4AddrIn: '192.168.0.101', - ipv4AddrExit: '192.168.1.101', includeInCountry: true, weight: 1, }, |