diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2018-09-06 12:37:04 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-09-06 15:29:49 +0100 |
| commit | 23d446f0efc39ad3047ddc2212832b0ca6185dca (patch) | |
| tree | fdf132ca200e340ff89bbdd59a2bb9c8e680f476 | |
| parent | 041b0a42a12dcf51a2ec17b09dc997c339b51f85 (diff) | |
| download | mullvadvpn-23d446f0efc39ad3047ddc2212832b0ca6185dca.tar.xz mullvadvpn-23d446f0efc39ad3047ddc2212832b0ca6185dca.zip | |
Fix relay list schema
| -rw-r--r-- | gui/packages/desktop/src/renderer/app.js | 4 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/lib/daemon-rpc.js | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 1 | ||||
| -rw-r--r-- | mullvad-types/src/relay_list.rs | 3 |
4 files changed, 2 insertions, 8 deletions
diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js index 6cf203f4cb..3384a6d3c8 100644 --- a/gui/packages/desktop/src/renderer/app.js +++ b/gui/packages/desktop/src/renderer/app.js @@ -339,13 +339,13 @@ export default class AppRenderer { const storedLocations = locations.countries.map((country) => ({ name: country.name, code: country.code, - hasActiveRelays: country.cities.some((city) => city.has_active_relays), + hasActiveRelays: country.cities.some((city) => city.relays.length > 0), cities: country.cities.map((city) => ({ name: city.name, code: city.code, latitude: city.latitude, longitude: city.longitude, - hasActiveRelays: city.has_active_relays, + hasActiveRelays: city.relays.length > 0, relays: city.relays, })), })); diff --git a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js index 7a3a0bb030..7b5eb86f3a 100644 --- a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js +++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js @@ -191,7 +191,6 @@ export type RelayListCity = { code: string, latitude: number, longitude: number, - has_active_relays: boolean, relays: Array<RelayListHostname>, }; @@ -214,7 +213,6 @@ const RelayListSchema = object({ code: string, latitude: number, longitude: number, - has_active_relays: boolean, relays: arrayOf( object({ hostname: string, diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index ff49e97c6e..0f35a25625 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -65,7 +65,6 @@ impl ParsedRelays { let country_name = country.name.clone(); let country_code = country.code.clone(); for city in &mut country.cities { - city.has_active_relays = !city.relays.is_empty(); let city_name = city.name.clone(); let city_code = city.code.clone(); let latitude = city.latitude; diff --git a/mullvad-types/src/relay_list.rs b/mullvad-types/src/relay_list.rs index 402b4f220b..cc970c2ee8 100644 --- a/mullvad-types/src/relay_list.rs +++ b/mullvad-types/src/relay_list.rs @@ -31,9 +31,6 @@ pub struct RelayListCity { pub code: CityCode, pub latitude: f64, pub longitude: f64, - #[serde(skip_deserializing)] - pub has_active_relays: bool, - #[serde(skip_serializing_if = "Vec::is_empty", default)] pub relays: Vec<Relay>, } |