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

Simplified bitcoin keys module name

Browse Source
This commit is contained in:
Dave Hrycyszyn
2024-06-25 13:36:50 +01:00
parent 037fc27b7b
commit 73f33a61e6
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
side-node/src/bitcoin/clients/btc_electrum_client.rs
View File

@@ -1,4 +1,4 @@
use crate::{ utils, bitcoin}; use crate::{bitcoin, utils};
use bdk::bitcoin::psbt::PartiallySignedTransaction; use bdk::bitcoin::psbt::PartiallySignedTransaction;
use bdk::bitcoin::Network; use bdk::bitcoin::Network;
use bdk::database::MemoryDatabase; use bdk::database::MemoryDatabase;
@@ -21,8 +21,8 @@ use bdk::{FeeRate, KeychainKind, SignOptions, TransactionDetails, Wallet};
pub async fn run() -> Result<(), anyhow::Error> { pub async fn run() -> Result<(), anyhow::Error> {
let dave = utils::home(&"dave".to_string()); let dave = utils::home(&"dave".to_string());
let sammy = utils::home(&"sammy".to_string()); let sammy = utils::home(&"sammy".to_string());
let dave_key = bitcoin::bitcoin_keys::load_from_file(&dave).unwrap(); let dave_key = bitcoin::keys::load_from_file(&dave).unwrap();
let sammy_key = bitcoin::bitcoin_keys::load_from_file(&sammy).unwrap(); let sammy_key = bitcoin::keys::load_from_file(&sammy).unwrap();
let dave_wallet = create_wallet(dave_key)?; let dave_wallet = create_wallet(dave_key)?;
let sammy_wallet = create_wallet(sammy_key)?; let sammy_wallet = create_wallet(sammy_key)?;

0
side-node/src/bitcoin/bitcoin_keys.rs → side-node/src/bitcoin/keys.rs
View File

2
side-node/src/bitcoin/mod.rs
View File

@@ -1,3 +1,3 @@
pub mod clients; pub mod clients;
pub mod bitcoin_keys; pub mod keys;

4
side-node/src/init/mod.rs
View File

@@ -2,7 +2,7 @@ use std::path::PathBuf;
use config::SideNodeConfig; use config::SideNodeConfig;
use crate::{keys, utils, bitcoin}; use crate::{bitcoin, keys, utils};
pub(crate) mod config; pub(crate) mod config;
@@ -14,7 +14,7 @@ pub(crate) fn init(home: PathBuf, config: SideNodeConfig) -> Result<(), std::io:
keys::bft_crdt::write(&bft_crdt_key_path)?; keys::bft_crdt::write(&bft_crdt_key_path)?;
println!("Writing bitcoin key to: {:?}", bitcoin_key_path); println!("Writing bitcoin key to: {:?}", bitcoin_key_path);
bitcoin::bitcoin_keys::write(&bitcoin_key_path)?; bitcoin::keys::write(&bitcoin_key_path)?;
println!("Writing config to: {:?}", config_path); println!("Writing config to: {:?}", config_path);
config::write_toml(&config, &config_path).expect("unable to write config file"); config::write_toml(&config, &config_path).expect("unable to write config file");

6
side-node/src/lib.rs
View File

@@ -5,7 +5,7 @@ use crdt::TransactionList;
use node::SideNode; use node::SideNode;
use tokio::{sync::mpsc, task}; use tokio::{sync::mpsc, task};
pub(crate) mod bitcoin; pub mod bitcoin;
pub(crate) mod cli; pub(crate) mod cli;
pub mod clients; pub mod clients;
pub mod crdt; pub mod crdt;
@@ -43,8 +43,8 @@ async fn setup(name: &String) -> SideNode {
// First, load up the keys and create a bft-crdt // First, load up the keys and create a bft-crdt
let side_dir = utils::home(name); let side_dir = utils::home(name);
let bft_crdt_keys = keys::bft_crdt::load_from_file(&side_dir); let bft_crdt_keys = keys::bft_crdt::load_from_file(&side_dir);
let bitcoin_keys = bitcoin::bitcoin_keys::load_from_file(&side_dir).unwrap(); let keys = bitcoin::keys::load_from_file(&side_dir).unwrap();
let bitcoin_wallet = bitcoin::clients::btc_electrum_client::create_wallet(bitcoin_keys).unwrap(); let bitcoin_wallet = bitcoin::clients::btc_electrum_client::create_wallet(keys).unwrap();
let crdt = BaseCrdt::<TransactionList>::new(&bft_crdt_keys); let crdt = BaseCrdt::<TransactionList>::new(&bft_crdt_keys);
// Channels for internal communication, and a tokio task for stdin input // Channels for internal communication, and a tokio task for stdin input

10
side-node/tests/side_node.rs
View File

@@ -2,7 +2,9 @@ use bft_json_crdt::{
json_crdt::{BaseCrdt, SignedOp}, json_crdt::{BaseCrdt, SignedOp},
keypair::make_keypair, keypair::make_keypair,
}; };
use side_node::{clients::websocket::Client, crdt::TransactionList, keys, node::SideNode, utils}; use side_node::{
bitcoin, clients::websocket::Client, crdt::TransactionList, node::SideNode, utils,
};
use tokio::sync::mpsc; use tokio::sync::mpsc;
#[tokio::test] #[tokio::test]
@@ -35,9 +37,9 @@ async fn test_distribute_via_websockets() {
async fn setup(_: &str) -> SideNode { async fn setup(_: &str) -> SideNode {
// First, load up the keys and create a bft-crdt // First, load up the keys and create a bft-crdt
let bft_crdt_keys = make_keypair(); let bft_crdt_keys = make_keypair();
let mnemonic_words = bitcoin::bitcoin_keys::make_mnemonic(); let mnemonic_words = bitcoin::keys::make_mnemonic();
let bitcoin_keys = bitcoin::bitcoin_keys::get(mnemonic_words).unwrap(); let keys = bitcoin::keys::get(mnemonic_words).unwrap();
let bitcoin_wallet = btc_electrum_client::create_wallet(bitcoin_keys).unwrap(); let bitcoin_wallet = bitcoin::clients::btc_electrum_client::create_wallet(keys).unwrap();
let crdt = BaseCrdt::<TransactionList>::new(&bft_crdt_keys); let crdt = BaseCrdt::<TransactionList>::new(&bft_crdt_keys);
// Channels for internal communication, and a tokio task for stdin input // Channels for internal communication, and a tokio task for stdin input