cast from proto enum

axelarnetwork · Jul 10, 2024 · 8eaef4f · 8eaef4f
1 parent 009ac2b
commit 8eaef4f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/src/multisig/key_presence.rs b/src/multisig/key_presence.rs
@@ -18,11 +18,8 @@ impl MultisigService {
         &self,
         request: proto::KeyPresenceRequest,
     ) -> TofndResult<proto::key_presence_response::Response> {
-        let algorithm = match request.algorithm {
-            0 => Algorithm::Ecdsa,
-            1 => Algorithm::Ed25519,
-            _ => return Err(anyhow!("Invalid algorithm: {}", request.algorithm)),
-        };
+        let algorithm = Algorithm::from_i32(request.algorithm)
+            .ok_or_else(|| anyhow!("Invalid algorithm: {}", request.algorithm))?;
 
         // check if mnemonic is available
         let _ = self

diff --git a/src/multisig/keygen.rs b/src/multisig/keygen.rs
@@ -7,11 +7,8 @@ use anyhow::anyhow;
 
 impl MultisigService {
     pub(super) async fn handle_keygen(&self, request: &KeygenRequest) -> TofndResult<Vec<u8>> {
-        let algorithm = match request.algorithm {
-            0 => Algorithm::Ecdsa,
-            1 => Algorithm::Ed25519,
-            _ => return Err(anyhow!("Invalid algorithm: {}", request.algorithm)),
-        };
+        let algorithm = Algorithm::from_i32(request.algorithm)
+            .ok_or_else(|| anyhow!("Invalid algorithm: {}", request.algorithm))?;
         let secret_recovery_key = self.kv_manager.seed().await?;
 
         Ok(

diff --git a/src/multisig/sign.rs b/src/multisig/sign.rs
@@ -9,11 +9,8 @@ use tofn::sdk::api::SecretRecoveryKey;
 
 impl MultisigService {
     pub(super) async fn handle_sign(&self, request: &SignRequest) -> TofndResult<Vec<u8>> {
-        let algorithm = match request.algorithm {
-            0 => Algorithm::Ecdsa,
-            1 => Algorithm::Ed25519,
-            _ => return Err(anyhow!("Invalid algorithm: {}", request.algorithm)),
-        };
+        let algorithm = Algorithm::from_i32(request.algorithm)
+            .ok_or_else(|| anyhow!("Invalid algorithm: {}", request.algorithm))?;
 
         // re-generate secret key from seed, then sign
         let secret_recovery_key = self