dave/bft-crdt-experiment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Closed off unnecessary public fn access in key generation

Browse Source
This commit is contained in:
Dave Hrycyszyn
2024-07-29 11:06:56 +01:00
parent 42dbf738c6
commit f78784973c
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
side-node/src/bitcoin/keys.rs
View File

@@ -12,12 +12,6 @@ use std::{
path::PathBuf, path::PathBuf,
}; };
pub fn make_mnemonic() -> String {
let mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
Mnemonic::generate((WordCount::Words12, Language::English)).unwrap();
mnemonic.to_string()
}
/// Write the mnemonic to a file in the node's side directory /// Write the mnemonic to a file in the node's side directory
/// ///
/// TODO: obviously spitting the mnemonic out to the console is not for production /// TODO: obviously spitting the mnemonic out to the console is not for production
@@ -30,8 +24,15 @@ pub(crate) fn write(mnemonic_path: &PathBuf) -> Result<(), std::io::Error> {
Ok(()) Ok(())
} }
pub(crate) fn load_from_file(side_dir: &PathBuf) -> anyhow::Result<ExtendedKey> {
let mnemonic_path = crate::utils::side_paths(side_dir.clone()).1; // TODO: this tuple stinks
let mnemonic_words = fs::read_to_string(mnemonic_path).expect("couldn't read bitcoin key file");
println!("Creating extended key from mnemonic: {mnemonic_words}");
generate_extended_key(mnemonic_words)
}
/// Creates Signet Bitcoin descriptors from a mnemonic /// Creates Signet Bitcoin descriptors from a mnemonic
pub fn get(mnemonic_words: String) -> anyhow::Result<ExtendedKey> { fn generate_extended_key(mnemonic_words: String) -> anyhow::Result<ExtendedKey> {
let mnemonic = Mnemonic::parse(mnemonic_words).unwrap(); let mnemonic = Mnemonic::parse(mnemonic_words).unwrap();
// Generate the extended key // Generate the extended key
@@ -42,9 +43,8 @@ pub fn get(mnemonic_words: String) -> anyhow::Result<ExtendedKey> {
Ok(xkey) Ok(xkey)
} }
pub(crate) fn load_from_file(side_dir: &PathBuf) -> anyhow::Result<ExtendedKey> { fn make_mnemonic() -> String {
let mnemonic_path = crate::utils::side_paths(side_dir.clone()).1; // TODO: this tuple stinks let mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
let mnemonic_words = fs::read_to_string(mnemonic_path).expect("couldn't read bitcoin key file"); Mnemonic::generate((WordCount::Words12, Language::English)).unwrap();
println!("Creating wallet from mnemonic: {mnemonic_words}"); mnemonic.to_string()
get(mnemonic_words)
} }