Refactor key pair implementations (#3568)

informalsystems · Aug 26, 2023 · 430c180 · 430c180
1 parent c44d2b1
commit 430c180
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/crates/relayer/src/keyring/ed25519_key_pair.rs b/crates/relayer/src/keyring/ed25519_key_pair.rs
@@ -83,6 +83,7 @@ impl Ed25519KeyPair {
 
 impl SigningKeyPair for Ed25519KeyPair {
     const KEY_TYPE: KeyType = KeyType::Ed25519;
+    type KeyFile = KeyFile;
 
     fn from_key_file(key_file: KeyFile, hd_path: &StandardHDPath) -> Result<Self, Error> {
         use ed25519_dalek::PUBLIC_KEY_LENGTH;

diff --git a/crates/relayer/src/keyring/secp256k1_key_pair.rs b/crates/relayer/src/keyring/secp256k1_key_pair.rs
@@ -233,6 +233,7 @@ impl Secp256k1KeyPair {
 
 impl SigningKeyPair for Secp256k1KeyPair {
     const KEY_TYPE: KeyType = KeyType::Secp256k1;
+    type KeyFile = KeyFile;
 
     fn from_key_file(key_file: KeyFile, hd_path: &StandardHDPath) -> Result<Self, Error> {
         // Decode the Bech32-encoded address from the key file

diff --git a/crates/relayer/src/keyring/signing_key_pair.rs b/crates/relayer/src/keyring/signing_key_pair.rs
@@ -3,13 +3,14 @@ use core::any::Any;
 use hdpath::StandardHDPath;
 use serde::{de::DeserializeOwned, Serialize};
 
-use super::{errors::Error, KeyFile, KeyType};
+use super::{errors::Error, KeyType};
 use crate::config::AddressType;
 
 pub trait SigningKeyPair {
     const KEY_TYPE: KeyType;
+    type KeyFile: DeserializeOwned;
 
-    fn from_key_file(key_file: KeyFile, hd_path: &StandardHDPath) -> Result<Self, Error>
+    fn from_key_file(key_file: Self::KeyFile, hd_path: &StandardHDPath) -> Result<Self, Error>
     where
         Self: Sized;