merge #125 into cyphar/paperback:main

Aleksa Sarai (1): cargo: update to tiny-bip39 v2 LGTMs: cyphar
cyphar · Oct 23, 2024 · e4750a1 · e4750a1
2 parents 0d9cabb + 4b6cc3b
commit e4750a1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pkg/paperback-core/Cargo.toml b/pkg/paperback-core/Cargo.toml
@@ -30,7 +30,6 @@ edition = "2021"
 
 [dependencies]
 aead = { version = "^0.5", features = ["std"] }
-anyhow = "^1"
 chacha20poly1305 = "^0.10"
 crypto-common = "^0.1"
 digest = "^0.10"
@@ -48,7 +47,7 @@ qrcode = "^0.14"
 serde = { version = "^1", features = ["derive"] }
 signature = "^2"
 thiserror = "^1"
-tiny-bip39 = "^1.0"
+tiny-bip39 = "^2"
 typenum = "^1"
 unsigned-varint = { version = "^0.7", features = ["nom"] }
 

diff --git a/pkg/paperback-core/src/v0/mod.rs b/pkg/paperback-core/src/v0/mod.rs
@@ -88,15 +88,6 @@ pub enum Error {
     Other(String),
 }
 
-impl From<anyhow::Error> for Error {
-    fn from(inner: anyhow::Error) -> Self {
-        match inner.downcast::<bip39::ErrorKind>() {
-            Ok(err) => Self::Bip39(err),
-            Err(err) => Self::Other(err.to_string()),
-        }
-    }
-}
-
 #[derive(Clone, Debug, Eq, PartialEq)]
 struct Identity {
     id_public_key: VerifyingKey,
@@ -230,7 +221,7 @@ impl KeyShard {
 
         // Convert key to a BIP-39 mnemonic.
         let phrase = Mnemonic::from_entropy(&shard_key, CODEWORD_LANGUAGE)
-            .map_err(Error::from)? // XXX: Ugly, fix this.
+            .map_err(Error::Bip39)?
             .into_phrase();
         let codewords = phrase
             .split_whitespace()