From 317679682439193477d7572b88d5b96cc945e3f5 Mon Sep 17 00:00:00 2001
From: Nicolas80 <nicolas.pmail@protonmail.com>
Date: Sun, 30 Mar 2025 18:09:29 +0200
Subject: [PATCH] * Small clippy cleanup
---
src/commands/vault.rs | 1 -
src/keys.rs | 16 ++++++----------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/commands/vault.rs b/src/commands/vault.rs
index f407474..1b66a60 100644
--- a/src/commands/vault.rs
+++ b/src/commands/vault.rs
@@ -572,7 +572,6 @@ pub async fn handle_command(data: Data, command: Subcommand) -> Result<(), GcliE
.borrow()
.account
.crypto_scheme
- .clone()
.ok_or(GcliError::Logic(
"Base account without crypto_scheme".to_string(),
))?
diff --git a/src/keys.rs b/src/keys.rs
index 3431e40..1108a96 100644
--- a/src/keys.rs
+++ b/src/keys.rs
@@ -148,18 +148,14 @@ pub fn get_keypair(
crypto_scheme: CryptoScheme,
) -> Result<KeyPair, GcliError> {
match (secret_format, secret) {
- (SecretFormat::Predefined, Some(deriv)) => {
- match crypto_scheme {
- CryptoScheme::Ed25519 => {
- pair_from_ed25519_str(&predefined_suri(deriv)).map(|v| v.into())
- }
- _ => pair_from_predefined(deriv).map(|v| v.into()),
+ (SecretFormat::Predefined, Some(deriv)) => match crypto_scheme {
+ CryptoScheme::Ed25519 => {
+ pair_from_ed25519_str(&predefined_suri(deriv)).map(|v| v.into())
}
- }
+ _ => pair_from_predefined(deriv).map(|v| v.into()),
+ },
(secret_format, None) => Ok(prompt_secret(secret_format, Some(crypto_scheme))),
- (_, Some(secret)) => {
- pair_from_secret_with_scheme(secret_format, secret, crypto_scheme)
- }
+ (_, Some(secret)) => pair_from_secret_with_scheme(secret_format, secret, crypto_scheme),
}
}
--
GitLab