diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-07-06 13:22:37 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-07-11 13:51:26 +0200 |
| commit | f7a3a5a6d33faa6ea6efc397ed2b7455e40e279c (patch) | |
| tree | 659b6dcb9cacac24dd66fe7f3fda174fb1822eae /mullvad-cli | |
| parent | 0c3a1f9d9aa8f35f33549c99c3d312f4ebc93f3b (diff) | |
| download | mullvadvpn-f7a3a5a6d33faa6ea6efc397ed2b7455e40e279c.tar.xz mullvadvpn-f7a3a5a6d33faa6ea6efc397ed2b7455e40e279c.zip | |
Return RelayList object instead of a stream in proto file
Diffstat (limited to 'mullvad-cli')
| -rw-r--r-- | mullvad-cli/src/cmds/bridge.rs | 4 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs index 27532f1416..6e09b75084 100644 --- a/mullvad-cli/src/cmds/bridge.rs +++ b/mullvad-cli/src/cmds/bridge.rs @@ -424,7 +424,7 @@ impl Bridge { async fn list_bridge_relays() -> Result<()> { let mut rpc = new_rpc_client().await?; - let mut locations = rpc + let relay_list = rpc .get_relay_locations(()) .await .map_err(|error| Error::RpcFailedExt("Failed to obtain relay locations", error))? @@ -432,7 +432,7 @@ impl Bridge { let mut countries = Vec::new(); - while let Some(mut country) = locations.message().await? { + for mut country in relay_list.countries { country.cities = country .cities .into_iter() diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index 8e68adda6c..22bf4788f2 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -718,7 +718,7 @@ impl Relay { async fn get_filtered_relays() -> Result<Vec<types::RelayListCountry>> { let mut rpc = new_rpc_client().await?; - let mut locations = rpc + let relay_list = rpc .get_relay_locations(()) .await .map_err(|error| Error::RpcFailedExt("Failed to obtain relay locations", error))? @@ -726,7 +726,7 @@ impl Relay { let mut countries = Vec::new(); - while let Some(mut country) = locations.message().await? { + for mut country in relay_list.countries { country.cities = country .cities .into_iter() |