Update WordsCount -> WordCount
This commit is contained in:
parent
9e29e2d2b1
commit
5922c216a1
@ -24,7 +24,7 @@ pub use bip39::{Language, Mnemonic};
|
|||||||
type Seed = [u8; 64];
|
type Seed = [u8; 64];
|
||||||
|
|
||||||
/// Type describing entropy length (aka word count) in the mnemonic
|
/// Type describing entropy length (aka word count) in the mnemonic
|
||||||
pub enum WordsCount {
|
pub enum WordCount {
|
||||||
/// 12 words mnemonic (128 bits entropy)
|
/// 12 words mnemonic (128 bits entropy)
|
||||||
Words12 = 128,
|
Words12 = 128,
|
||||||
/// 15 words mnemonic (160 bits entropy)
|
/// 15 words mnemonic (160 bits entropy)
|
||||||
@ -117,7 +117,7 @@ impl<Ctx: ScriptContext> DerivableKey<Ctx> for Mnemonic {
|
|||||||
impl<Ctx: ScriptContext> GeneratableKey<Ctx> for Mnemonic {
|
impl<Ctx: ScriptContext> GeneratableKey<Ctx> for Mnemonic {
|
||||||
type Entropy = [u8; 32];
|
type Entropy = [u8; 32];
|
||||||
|
|
||||||
type Options = (WordsCount, Language);
|
type Options = (WordCount, Language);
|
||||||
type Error = Option<bip39::Error>;
|
type Error = Option<bip39::Error>;
|
||||||
|
|
||||||
fn generate_with_entropy(
|
fn generate_with_entropy(
|
||||||
@ -141,7 +141,7 @@ mod test {
|
|||||||
|
|
||||||
use crate::keys::{any_network, GeneratableKey, GeneratedKey};
|
use crate::keys::{any_network, GeneratableKey, GeneratedKey};
|
||||||
|
|
||||||
use super::WordsCount;
|
use super::WordCount;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_keys_bip39_mnemonic() {
|
fn test_keys_bip39_mnemonic() {
|
||||||
@ -175,7 +175,7 @@ mod test {
|
|||||||
fn test_keys_generate_bip39() {
|
fn test_keys_generate_bip39() {
|
||||||
let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
|
let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
|
||||||
Mnemonic::generate_with_entropy(
|
Mnemonic::generate_with_entropy(
|
||||||
(WordsCount::Words12, Language::English),
|
(WordCount::Words12, Language::English),
|
||||||
crate::keys::test::TEST_ENTROPY,
|
crate::keys::test::TEST_ENTROPY,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@ -187,7 +187,7 @@ mod test {
|
|||||||
|
|
||||||
let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
|
let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
|
||||||
Mnemonic::generate_with_entropy(
|
Mnemonic::generate_with_entropy(
|
||||||
(WordsCount::Words24, Language::English),
|
(WordCount::Words24, Language::English),
|
||||||
crate::keys::test::TEST_ENTROPY,
|
crate::keys::test::TEST_ENTROPY,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@ -198,11 +198,11 @@ mod test {
|
|||||||
#[test]
|
#[test]
|
||||||
fn test_keys_generate_bip39_random() {
|
fn test_keys_generate_bip39_random() {
|
||||||
let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
|
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());
|
assert_eq!(generated_mnemonic.valid_networks, any_network());
|
||||||
|
|
||||||
let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
|
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());
|
assert_eq!(generated_mnemonic.valid_networks, any_network());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user