Implement From for IpVersion

2 files changed, 19 insertions, 7 deletions

diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index e87c1d837d..cb1116e37b 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -1027,13 +1027,8 @@ fn convert_relay_settings(settings: &RelaySettings) -> types::RelaySettings {
                         .wireguard_constraints
                         .ip_version
                         .option()
-                        .map(|version| match version {
-                            IpVersion::V4 => types::IpVersion::V4,
-                            IpVersion::V6 => types::IpVersion::V6,
-                        })
-                        .map(|version| types::IpVersionConstraint {
-                            protocol: i32::from(version),
-                        }),
+                        .map(types::IpVersion::from)
+                        .map(types::IpVersionConstraint::from),
                 }),
 
                 openvpn_constraints: Some(types::OpenvpnConstraints {
diff --git a/mullvad-management-interface/src/types.rs b/mullvad-management-interface/src/types.rs
index fd1d04adb1..279e9d7b37 100644
--- a/mullvad-management-interface/src/types.rs
+++ b/mullvad-management-interface/src/types.rs
@@ -77,6 +77,23 @@ impl From<TransportProtocol> for TransportProtocolConstraint {
     }
 }
 
+impl From<talpid_types::net::IpVersion> for IpVersion {
+    fn from(version: talpid_types::net::IpVersion) -> Self {
+        match version {
+            talpid_types::net::IpVersion::V4 => Self::V4,
+            talpid_types::net::IpVersion::V6 => Self::V6,
+        }
+    }
+}
+
+impl From<IpVersion> for IpVersionConstraint {
+    fn from(version: IpVersion) -> Self {
+        Self {
+            protocol: i32::from(version),
+        }
+    }
+}
+
 impl From<TransportProtocol> for talpid_types::net::TransportProtocol {
     fn from(protocol: TransportProtocol) -> Self {
         match protocol {