Bladeren bron

chore: refactor and clean up

Yujia Qiao 4 jaren geleden
bovenliggende
commit
3d245c5e5f
2 gewijzigde bestanden met toevoegingen van 2 en 13 verwijderingen
  1. 0 12
      src/config.rs
  2. 2 1
      src/transport/noise.rs

+ 0 - 12
src/config.rs

@@ -26,24 +26,12 @@ impl Deref for MaskedString {
     }
 }
 
-impl AsRef<[u8]> for MaskedString {
-    fn as_ref(&self) -> &[u8] {
-        self.0.as_bytes()
-    }
-}
-
 impl From<&str> for MaskedString {
     fn from(s: &str) -> MaskedString {
         MaskedString(String::from(s))
     }
 }
 
-impl From<MaskedString> for String {
-    fn from(s: MaskedString) -> String {
-        s.0
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize, Copy, Clone, PartialEq)]
 pub enum TransportType {
     #[serde(rename = "tcp")]

+ 2 - 1
src/transport/noise.rs

@@ -54,7 +54,8 @@ impl Transport for NoiseTransport {
         };
 
         let local_private_key = match &config.local_private_key {
-            Some(x) => base64::decode(x).with_context(|| "Failed to decode local_private_key")?,
+            Some(x) => base64::decode(x.as_bytes())
+                .with_context(|| "Failed to decode local_private_key")?,
             None => builder.generate_keypair()?.private,
         };