Added conversion to wrapped types to ed/secp pk/sk/sig types

keyvault/src/ed25519/pk.rs

@@ -40,6 +40,12 @@ impl From<ed::PublicKey> for EdPublicKey {
     }
 }
 
+impl<'a> From<&'a EdPublicKey> for &'a ed::PublicKey {
+    fn from(pk: &'a EdPublicKey) -> &'a ed::PublicKey {
+        &pk.0
+    }
+}
+
 impl PublicKey<Ed25519> for EdPublicKey {
     fn key_id(&self) -> EdKeyId {
         EdKeyId::from(self)

keyvault/src/ed25519/sk.rs

@@ -56,7 +56,13 @@ impl PrivateKey<Ed25519> for EdPrivateKey {
 }
 
 impl From<ed::Keypair> for EdPrivateKey {
-    fn from(kp: ed::Keypair) -> Self {
-        Self(kp)
+    fn from(sk: ed::Keypair) -> Self {
+        Self(sk)
+    }
+}
+
+impl From<EdPrivateKey> for ed::Keypair {
+    fn from(sk: EdPrivateKey) -> ed::Keypair {
+        sk.0
     }
 }

keyvault/src/secp256k1/pk.rs

@@ -122,6 +122,18 @@ impl fmt::Debug for SecpPublicKey {
     }
 }
 
+impl From<secp::PublicKey> for SecpPublicKey {
+    fn from(pk: secp::PublicKey) -> Self {
+        Self(pk)
+    }
+}
+
+impl From<SecpPublicKey> for secp::PublicKey {
+    fn from(pk: SecpPublicKey) -> secp::PublicKey {
+        pk.0
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

keyvault/src/secp256k1/sig.rs

@@ -75,6 +75,18 @@ impl fmt::Debug for SecpSignature {
     }
 }
 
+impl From<secp::Signature> for SecpSignature {
+    fn from(sig: secp::Signature) -> Self {
+        Self(sig)
+    }
+}
+
+impl From<SecpSignature> for secp::Signature {
+    fn from(sig: SecpSignature) -> secp::Signature {
+        sig.0
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

keyvault/src/secp256k1/sk.rs

@@ -97,3 +97,15 @@ impl PrivateKey<Secp256k1> for SecpPrivateKey {
         SecpSignature(sig)
     }
 }
+
+impl From<secp::SecretKey> for SecpPrivateKey {
+    fn from(sk: secp::SecretKey) -> Self {
+        Self(sk)
+    }
+}
+
+impl From<SecpPrivateKey> for secp::SecretKey {
+    fn from(sk: SecpPrivateKey) -> secp::SecretKey {
+        sk.0
+    }
+}