From 9e29e2d2b182de901c5019f74dd5d513281e9ba1 Mon Sep 17 00:00:00 2001 From: rajarshimaitra Date: Sat, 6 Nov 2021 20:13:45 +0530 Subject: [PATCH 1/2] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94355f521..ddb80403c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- BIP39 implementation dependency, in `keys::bip39` changed from tiny-bip39 to rust-bip39. + ## [v0.13.0] - [v0.12.0] - Exposed `get_tx()` method from `Database` to `Wallet`. From 5922c216a1f1765ce7566ad520e1a8f91f007600 Mon Sep 17 00:00:00 2001 From: rajarshimaitra Date: Sat, 6 Nov 2021 20:14:03 +0530 Subject: [PATCH 2/2] Update WordsCount -> WordCount --- src/keys/bip39.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/keys/bip39.rs b/src/keys/bip39.rs index 2929c629a..c6cf24fd4 100644 --- a/src/keys/bip39.rs +++ b/src/keys/bip39.rs @@ -24,7 +24,7 @@ pub use bip39::{Language, Mnemonic}; type Seed = [u8; 64]; /// Type describing entropy length (aka word count) in the mnemonic -pub enum WordsCount { +pub enum WordCount { /// 12 words mnemonic (128 bits entropy) Words12 = 128, /// 15 words mnemonic (160 bits entropy) @@ -117,7 +117,7 @@ impl DerivableKey for Mnemonic { impl GeneratableKey for Mnemonic { type Entropy = [u8; 32]; - type Options = (WordsCount, Language); + type Options = (WordCount, Language); type Error = Option; fn generate_with_entropy( @@ -141,7 +141,7 @@ mod test { use crate::keys::{any_network, GeneratableKey, GeneratedKey}; - use super::WordsCount; + use super::WordCount; #[test] fn test_keys_bip39_mnemonic() { @@ -175,7 +175,7 @@ mod test { fn test_keys_generate_bip39() { let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> = Mnemonic::generate_with_entropy( - (WordsCount::Words12, Language::English), + (WordCount::Words12, Language::English), crate::keys::test::TEST_ENTROPY, ) .unwrap(); @@ -187,7 +187,7 @@ mod test { let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> = Mnemonic::generate_with_entropy( - (WordsCount::Words24, Language::English), + (WordCount::Words24, Language::English), crate::keys::test::TEST_ENTROPY, ) .unwrap(); @@ -198,11 +198,11 @@ mod test { #[test] fn test_keys_generate_bip39_random() { let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> = - Mnemonic::generate((WordsCount::Words12, Language::English)).unwrap(); + Mnemonic::generate((WordCount::Words12, Language::English)).unwrap(); assert_eq!(generated_mnemonic.valid_networks, any_network()); let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> = - Mnemonic::generate((WordsCount::Words24, Language::English)).unwrap(); + Mnemonic::generate((WordCount::Words24, Language::English)).unwrap(); assert_eq!(generated_mnemonic.valid_networks, any_network()); } }