Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Backport KVStore changes #159

Closed
wants to merge 3 commits into from
Closed

WIP: Backport KVStore changes #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75ffc50
Simplify and fix `TestStore`
tnull Aug 22, 2023
89e97ab
Sort values returned from `KVStore::list`
tnull Aug 24, 2023
76d2f03
Refactor test code and introduce `TestSyncStore`
tnull Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/io/fs_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ impl KVStore for FilesystemStore {
}
}

keys.sort();

Ok(keys)
}
}
Expand Down
1 change: 1 addition & 0 deletions src/io/sqlite_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ impl KVStore for SqliteStore {
})?);
}

keys.sort();
Ok(keys)
}
}
Expand Down
144 changes: 12 additions & 132 deletions src/test/functional_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::builder::NodeBuilder;
use crate::io::KVStore;
use crate::test::utils::*;
use crate::test::utils::{expect_event, random_config};
use crate::test::utils::{expect_event, random_config, setup_two_nodes};
use crate::{Error, Event, Node, PaymentDirection, PaymentStatus};

use bitcoin::Amount;
Expand All @@ -11,45 +11,14 @@ use electrsd::ElectrsD;
#[test]
fn channel_full_cycle() {
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
println!("== Node A ==");
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
let config_a = random_config();
let mut builder_a = NodeBuilder::from_config(config_a);
builder_a.set_esplora_server(esplora_url.clone());
let node_a = builder_a.build().unwrap();
node_a.start().unwrap();

println!("\n== Node B ==");
let config_b = random_config();
let mut builder_b = NodeBuilder::from_config(config_b);
builder_b.set_esplora_server(esplora_url);
let node_b = builder_b.build().unwrap();
node_b.start().unwrap();

let (node_a, node_b) = setup_two_nodes(&electrsd, false);
do_channel_full_cycle(node_a, node_b, &bitcoind, &electrsd, false);
}

#[test]
fn channel_full_cycle_0conf() {
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
println!("== Node A ==");
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
let config_a = random_config();
let mut builder_a = NodeBuilder::from_config(config_a);
builder_a.set_esplora_server(esplora_url.clone());
let node_a = builder_a.build().unwrap();
node_a.start().unwrap();

println!("\n== Node B ==");
let mut config_b = random_config();
config_b.trusted_peers_0conf.push(node_a.node_id());

let mut builder_b = NodeBuilder::from_config(config_b);
builder_b.set_esplora_server(esplora_url.clone());
let node_b = builder_b.build().unwrap();

node_b.start().unwrap();

let (node_a, node_b) = setup_two_nodes(&electrsd, true);
do_channel_full_cycle(node_a, node_b, &bitcoind, &electrsd, true)
}

Expand Down Expand Up @@ -271,21 +240,9 @@ fn do_channel_full_cycle<K: KVStore + Sync + Send>(
#[test]
fn channel_open_fails_when_funds_insufficient() {
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
println!("== Node A ==");
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
let config_a = random_config();
let mut builder_a = NodeBuilder::from_config(config_a);
builder_a.set_esplora_server(esplora_url.clone());
let node_a = builder_a.build().unwrap();
node_a.start().unwrap();
let addr_a = node_a.new_onchain_address().unwrap();
let (node_a, node_b) = setup_two_nodes(&electrsd, false);

println!("\n== Node B ==");
let config_b = random_config();
let mut builder_b = NodeBuilder::from_config(config_b);
builder_b.set_esplora_server(esplora_url);
let node_b = builder_b.build().unwrap();
node_b.start().unwrap();
let addr_a = node_a.new_onchain_address().unwrap();
let addr_b = node_b.new_onchain_address().unwrap();

let premine_amount_sat = 100_000;
Expand Down Expand Up @@ -329,26 +286,22 @@ fn connect_to_public_testnet_esplora() {
#[test]
fn start_stop_reinit() {
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
let config = random_config();
let mut builder = NodeBuilder::from_config(config.clone());
builder.set_esplora_server(esplora_url.clone());
let node = builder.build().unwrap();
let node = setup_node(&electrsd, config.clone());

let expected_node_id = node.node_id();
assert_eq!(node.start(), Err(Error::AlreadyRunning));

let funding_address = node.new_onchain_address().unwrap();
let expected_amount = Amount::from_sat(100000);

premine_and_distribute_funds(&bitcoind, &electrsd, vec![funding_address], expected_amount);
assert_eq!(node.total_onchain_balance_sats().unwrap(), 0);

node.start().unwrap();
assert_eq!(node.start(), Err(Error::AlreadyRunning));

node.sync_wallets().unwrap();
assert_eq!(node.spendable_onchain_balance_sats().unwrap(), expected_amount.to_sat());

let log_file_symlink = format!("{}/logs/ldk_node_latest.log", config.storage_dir_path);
let log_file_symlink = format!("{}/logs/ldk_node_latest.log", config.clone().storage_dir_path);
assert!(std::path::Path::new(&log_file_symlink).is_symlink());

node.stop().unwrap();
Expand All @@ -361,66 +314,9 @@ fn start_stop_reinit() {
assert_eq!(node.stop(), Err(Error::NotRunning));
drop(node);

let mut new_builder = NodeBuilder::from_config(config);
new_builder.set_esplora_server(esplora_url);
let reinitialized_node = builder.build().unwrap();
assert_eq!(reinitialized_node.node_id(), expected_node_id);

reinitialized_node.start().unwrap();

assert_eq!(
reinitialized_node.spendable_onchain_balance_sats().unwrap(),
expected_amount.to_sat()
);

reinitialized_node.sync_wallets().unwrap();
assert_eq!(
reinitialized_node.spendable_onchain_balance_sats().unwrap(),
expected_amount.to_sat()
);

reinitialized_node.stop().unwrap();
}

#[test]
fn start_stop_reinit_fs_store() {
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
let config = random_config();
let mut builder = NodeBuilder::from_config(config.clone());
builder.set_esplora_server(esplora_url.clone());
let node = builder.build_with_fs_store().unwrap();
let expected_node_id = node.node_id();

let funding_address = node.new_onchain_address().unwrap();
let expected_amount = Amount::from_sat(100000);

premine_and_distribute_funds(&bitcoind, &electrsd, vec![funding_address], expected_amount);
assert_eq!(node.total_onchain_balance_sats().unwrap(), 0);

node.start().unwrap();
assert_eq!(node.start(), Err(Error::AlreadyRunning));

node.sync_wallets().unwrap();
assert_eq!(node.spendable_onchain_balance_sats().unwrap(), expected_amount.to_sat());

node.stop().unwrap();
assert_eq!(node.stop(), Err(Error::NotRunning));

node.start().unwrap();
assert_eq!(node.start(), Err(Error::AlreadyRunning));

node.stop().unwrap();
assert_eq!(node.stop(), Err(Error::NotRunning));
drop(node);

let mut new_builder = NodeBuilder::from_config(config);
new_builder.set_esplora_server(esplora_url);
let reinitialized_node = builder.build_with_fs_store().unwrap();
let reinitialized_node = setup_node(&electrsd, config);
assert_eq!(reinitialized_node.node_id(), expected_node_id);

reinitialized_node.start().unwrap();

assert_eq!(
reinitialized_node.spendable_onchain_balance_sats().unwrap(),
expected_amount.to_sat()
Expand All @@ -438,20 +334,9 @@ fn start_stop_reinit_fs_store() {
#[test]
fn onchain_spend_receive() {
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
let (node_a, node_b) = setup_two_nodes(&electrsd, false);

let config_a = random_config();
let mut builder_a = NodeBuilder::from_config(config_a);
builder_a.set_esplora_server(esplora_url.clone());
let node_a = builder_a.build().unwrap();
node_a.start().unwrap();
let addr_a = node_a.new_onchain_address().unwrap();

let config_b = random_config();
let mut builder_b = NodeBuilder::from_config(config_b);
builder_b.set_esplora_server(esplora_url);
let node_b = builder_b.build().unwrap();
node_b.start().unwrap();
let addr_b = node_b.new_onchain_address().unwrap();

premine_and_distribute_funds(
Expand Down Expand Up @@ -494,13 +379,8 @@ fn onchain_spend_receive() {
#[test]
fn sign_verify_msg() {
let (_bitcoind, electrsd) = setup_bitcoind_and_electrsd();
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
let config = random_config();
let mut builder = NodeBuilder::from_config(config.clone());
builder.set_esplora_server(esplora_url.clone());
let node = builder.build().unwrap();

node.start().unwrap();
let node = setup_node(&electrsd, config);

// Tests arbitrary message signing and later verification
let msg = "OK computer".as_bytes();
Expand Down
Loading
Loading