diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2023-10-26 16:10:45 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2023-12-04 09:06:30 +0100 |
| commit | 0d638dbbde30141a2da5ac64556e192fc98b633e (patch) | |
| tree | 46364903f2a422b91dc9f2125b6f8d6e4b1faf94 /mullvad-management-interface/src | |
| parent | 960a0ed3c41603f488114f95a3c8a8c27ff7ca96 (diff) | |
| download | mullvadvpn-0d638dbbde30141a2da5ac64556e192fc98b633e.tar.xz mullvadvpn-0d638dbbde30141a2da5ac64556e192fc98b633e.zip | |
Move access method testing logic to `mullvad-daemon`
Move access method testing logic to `mullvad-daemon`, which means that
the implementation details of how the test works is opaque to whatever
frontend which wants to issue a test of some (configured) access method.
Diffstat (limited to 'mullvad-management-interface/src')
| -rw-r--r-- | mullvad-management-interface/src/client.rs | 11 | ||||
| -rw-r--r-- | mullvad-management-interface/src/types/conversions/net.rs | 21 |
2 files changed, 4 insertions, 28 deletions
diff --git a/mullvad-management-interface/src/client.rs b/mullvad-management-interface/src/client.rs index 64ee088d18..c24f30260e 100644 --- a/mullvad-management-interface/src/client.rs +++ b/mullvad-management-interface/src/client.rs @@ -208,15 +208,12 @@ impl MullvadProxyClient { }) } - pub async fn get_api_addresses(&mut self) -> Result<Vec<std::net::SocketAddr>> { + pub async fn test_api_access_method(&mut self, id: access_method::Id) -> Result<()> { self.0 - .get_api_addresses(()) + .test_api_access_method(types::Uuid::from(id)) .await - .map_err(Error::Rpc) - .map(tonic::Response::into_inner) - .and_then(|api_addresses| { - Vec::<std::net::SocketAddr>::try_from(api_addresses).map_err(Error::InvalidResponse) - }) + .map_err(Error::Rpc)?; + Ok(()) } pub async fn update_relay_locations(&mut self) -> Result<()> { diff --git a/mullvad-management-interface/src/types/conversions/net.rs b/mullvad-management-interface/src/types/conversions/net.rs index 7b24a8f2b4..e2df5553a0 100644 --- a/mullvad-management-interface/src/types/conversions/net.rs +++ b/mullvad-management-interface/src/types/conversions/net.rs @@ -163,27 +163,6 @@ impl From<proto::IpVersion> for talpid_types::net::IpVersion { } } -impl TryFrom<proto::ApiAddresses> for Vec<SocketAddr> { - type Error = FromProtobufTypeError; - - fn try_from(value: proto::ApiAddresses) -> Result<Self, Self::Error> { - value - .api_addresses - .iter() - .map(|api_address| api_address.parse::<SocketAddr>()) - .collect::<Result<_, _>>() - .map_err(|_| FromProtobufTypeError::InvalidArgument("Invalid socket address")) - } -} - -impl From<Vec<SocketAddr>> for proto::ApiAddresses { - fn from(value: Vec<SocketAddr>) -> Self { - Self { - api_addresses: value.iter().map(SocketAddr::to_string).collect(), - } - } -} - pub fn try_tunnel_type_from_i32( tunnel_type: i32, ) -> Result<talpid_types::net::TunnelType, FromProtobufTypeError> { |
