diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-08-24 07:41:45 -0300 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-09-05 15:51:52 +0200 |
| commit | 7b3453bd438355bc119ca2f4dddc5bf5d010d3cc (patch) | |
| tree | 9a54a445b2d8d0914640a22ed6e27e9a6792a404 | |
| parent | cd83e3fac83cd2be17ef2ddd611f6edce9597a44 (diff) | |
| download | mullvadvpn-7b3453bd438355bc119ca2f4dddc5bf5d010d3cc.tar.xz mullvadvpn-7b3453bd438355bc119ca2f4dddc5bf5d010d3cc.zip | |
Add relay servers to relay list types
| -rw-r--r-- | gui/packages/desktop/src/renderer/lib/daemon-rpc.js | 9 | ||||
| -rw-r--r-- | gui/packages/desktop/test/components/SelectLocation.spec.js | 18 |
2 files changed, 27 insertions, 0 deletions
diff --git a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js index a547f756a8..36dd61238c 100644 --- a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js +++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js @@ -185,6 +185,15 @@ export type RelayListCity = { latitude: number, longitude: number, has_active_relays: boolean, + relays: Array<RelayListHostname>, +}; + +export type RelayListHostname = { + hostname: string, + ipv4_addr_in: string, + ipv4_addr_exit: string, + include_in_country: boolean, + weight: number, }; const RelayListSchema = object({ diff --git a/gui/packages/desktop/test/components/SelectLocation.spec.js b/gui/packages/desktop/test/components/SelectLocation.spec.js index cd45ff2e76..3d35da0edd 100644 --- a/gui/packages/desktop/test/components/SelectLocation.spec.js +++ b/gui/packages/desktop/test/components/SelectLocation.spec.js @@ -29,6 +29,15 @@ describe('components/SelectLocation', () => { latitude: 0, longitude: 0, hasActiveRelays: true, + relays: [ + { + hostname: 'fake1.mullvad.net', + ipv4AddrIn: '192.168.0.100', + ipv4AddrExit: '192.168.1.100', + includeInCountry: true, + weight: 1, + }, + ], }, { name: 'Stockholm', @@ -36,6 +45,15 @@ describe('components/SelectLocation', () => { latitude: 0, longitude: 0, hasActiveRelays: true, + relays: [ + { + hostname: 'fake2.mullvad.net', + ipv4AddrIn: '192.168.0.101', + ipv4AddrExit: '192.168.1.101', + includeInCountry: true, + weight: 1, + }, + ], }, ], }, |