Drop OnceCell in lightning-transaction-sync tests#2132

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

Merged
TheBlueMatt merged 2 commits into from
Mar 28, 2023
Merged

Drop OnceCell in lightning-transaction-sync tests #2132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f75ad80
Move test `bitcoind`/`electrsd` out of `OnceCell`
tnull Mar 27, 2023
7b85eba
Remove unnecessary restriction on `esplora-client` version
tnull Mar 27, 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
3 changes: 1 addition & 2 deletions lightning-transaction-sync/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,11 @@ lightning = { version = "0.0.114", path = "../lightning", default-features = fal
bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
esplora-client = { version = "0.3", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
electrum-client = "0.12.0"
once_cell = "1.16.0"
tokio = { version = "1.14.0", features = ["full"] }
147 changes: 60 additions & 87 deletions lightning-transaction-sync/tests/integration_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,78 +12,61 @@ use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
use bitcoind::bitcoincore_rpc::RpcApi;
use electrum_client::ElectrumApi;

use once_cell::sync::OnceCell;

use std::env;
use std::sync::Mutex;
use std::time::Duration;
use std::collections::{HashMap, HashSet};

static BITCOIND: OnceCell<BitcoinD> = OnceCell::new();
static ELECTRSD: OnceCell<ElectrsD> = OnceCell::new();
static PREMINE: OnceCell<()> = OnceCell::new();
static MINER_LOCK: OnceCell<Mutex<()>> = OnceCell::new();

fn get_bitcoind() -> &'static BitcoinD {
BITCOIND.get_or_init(|| {
let bitcoind_exe =
env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
"you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
);
let mut conf = bitcoind::Conf::default();
conf.network = "regtest";
let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();
std::thread::sleep(Duration::from_secs(1));
bitcoind
})
}

fn get_electrsd() -> &'static ElectrsD {
ELECTRSD.get_or_init(|| {
let bitcoind = get_bitcoind();
let electrs_exe =
env::var("ELECTRS_EXE").ok().or_else(electrsd::downloaded_exe_path).expect(
"you need to provide env var ELECTRS_EXE or specify an electrsd version feature",
);
let mut conf = electrsd::Conf::default();
conf.http_enabled = true;
conf.network = "regtest";
let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &conf).unwrap();
std::thread::sleep(Duration::from_secs(1));
electrsd
})
pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
let bitcoind_exe =
env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
"you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
);
let mut bitcoind_conf = bitcoind::Conf::default();
bitcoind_conf.network = "regtest";
let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();

let electrs_exe = env::var("ELECTRS_EXE")
.ok()
.or_else(electrsd::downloaded_exe_path)
.expect("you need to provide env var ELECTRS_EXE or specify an electrsd version feature");
let mut electrsd_conf = electrsd::Conf::default();
electrsd_conf.http_enabled = true;
electrsd_conf.network = "regtest";
let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &electrsd_conf).unwrap();
(bitcoind, electrsd)
}

fn generate_blocks_and_wait(num: usize) {
let miner_lock = MINER_LOCK.get_or_init(|| Mutex::new(()));
let _miner = miner_lock.lock().unwrap();
let cur_height = get_bitcoind().client.get_block_count().expect("failed to get current block height");
let address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).expect("failed to get new address");
pub fn generate_blocks_and_wait(bitcoind: &BitcoinD, electrsd: &ElectrsD, num: usize) {
let cur_height = bitcoind.client.get_block_count().expect("failed to get current block height");
let address = bitcoind
.client
.get_new_address(Some("test"), Some(AddressType::Legacy))
.expect("failed to get new address");
// TODO: expect this Result once the WouldBlock issue is resolved upstream.
let _block_hashes_res = get_bitcoind().client.generate_to_address(num as u64, &address);
wait_for_block(cur_height as usize + num);
let _block_hashes_res = bitcoind.client.generate_to_address(num as u64, &address);
wait_for_block(electrsd, cur_height as usize + num);
}

fn wait_for_block(min_height: usize) {
let mut header = match get_electrsd().client.block_headers_subscribe() {
pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
let mut header = match electrsd.client.block_headers_subscribe() {
Ok(header) => header,
Err(_) => {
// While subscribing should succeed the first time around, we ran into some cases where
// it didn't. Since we can't proceed without subscribing, we try again after a delay
// and panic if it still fails.
std::thread::sleep(Duration::from_secs(1));
get_electrsd().client.block_headers_subscribe().expect("failed to subscribe to block headers")
electrsd.client.block_headers_subscribe().expect("failed to subscribe to block headers")
}
};

loop {
if header.height >= min_height {
break;
}
header = exponential_backoff_poll(|| {
get_electrsd().trigger().expect("failed to trigger electrsd");
get_electrsd().client.ping().expect("failed to ping electrsd");
get_electrsd().client.block_headers_pop().expect("failed to pop block header")
electrsd.trigger().expect("failed to trigger electrsd");
electrsd.client.ping().expect("failed to ping electrsd");
electrsd.client.block_headers_pop().expect("failed to pop block header")
});
}
}
Expand All@@ -109,12 +92,6 @@ where
}
}

fn premine() {
PREMINE.get_or_init(|| {
generate_blocks_and_wait(101);
});
}

#[derive(Debug)]
enum TestConfirmableEvent {
Confirmed(Txid, BlockHash, u32),
Expand DownExpand Up@@ -182,27 +159,25 @@ impl Logger for TestLogger {
#[test]
#[cfg(feature = "esplora-blocking")]
fn test_esplora_syncs() {
premine();
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
generate_blocks_and_wait(&bitcoind, &electrsd, 101);
let mut logger = TestLogger {};
let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
let confirmable = TestConfirmable::new();

// Check we pick up on new best blocks
let expected_height = 0u32;
assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

tx_sync.sync(vec![&confirmable]).unwrap();

let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
assert_eq!(events.len(), 1);

// Check registered confirmed transactions are marked confirmed
let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
tx_sync.register_tx(&txid, &new_address.script_pubkey());

tx_sync.sync(vec![&confirmable]).unwrap();
Expand All@@ -212,7 +187,7 @@ fn test_esplora_syncs() {
assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

generate_blocks_and_wait(1);
generate_blocks_and_wait(&bitcoind, &electrsd, 1);
tx_sync.sync(vec![&confirmable]).unwrap();

let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -221,19 +196,19 @@ fn test_esplora_syncs() {
assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

// Check previously confirmed transactions are marked unconfirmed when they are reorged.
let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

// We're getting back to the previous height with a new tip, but best block shouldn't change.
generate_blocks_and_wait(1);
assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
generate_blocks_and_wait(&bitcoind, &electrsd, 1);
assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
tx_sync.sync(vec![&confirmable]).unwrap();
let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
assert_eq!(events.len(), 0);

// Now we're surpassing previous height, getting new tip.
generate_blocks_and_wait(1);
assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
generate_blocks_and_wait(&bitcoind, &electrsd, 1);
assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
tx_sync.sync(vec![&confirmable]).unwrap();

// Transaction still confirmed but under new tip.
Expand DownExpand Up@@ -267,27 +242,25 @@ fn test_esplora_syncs() {
#[tokio::test]
#[cfg(feature = "esplora-async")]
async fn test_esplora_syncs() {
premine();
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
generate_blocks_and_wait(&bitcoind, &electrsd, 101);
let mut logger = TestLogger {};
let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
let confirmable = TestConfirmable::new();

// Check we pick up on new best blocks
let expected_height = 0u32;
assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

tx_sync.sync(vec![&confirmable]).await.unwrap();

let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
assert_eq!(events.len(), 1);

// Check registered confirmed transactions are marked confirmed
let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
tx_sync.register_tx(&txid, &new_address.script_pubkey());

tx_sync.sync(vec![&confirmable]).await.unwrap();
Expand All@@ -297,7 +270,7 @@ async fn test_esplora_syncs() {
assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

generate_blocks_and_wait(1);
generate_blocks_and_wait(&bitcoind, &electrsd, 1);
tx_sync.sync(vec![&confirmable]).await.unwrap();

let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -306,19 +279,19 @@ async fn test_esplora_syncs() {
assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

// Check previously confirmed transactions are marked unconfirmed when they are reorged.
let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

// We're getting back to the previous height with a new tip, but best block shouldn't change.
generate_blocks_and_wait(1);
assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
generate_blocks_and_wait(&bitcoind, &electrsd, 1);
assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
tx_sync.sync(vec![&confirmable]).await.unwrap();
let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
assert_eq!(events.len(), 0);

// Now we're surpassing previous height, getting new tip.
generate_blocks_and_wait(1);
assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
generate_blocks_and_wait(&bitcoind, &electrsd, 1);
assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
tx_sync.sync(vec![&confirmable]).await.unwrap();

// Transaction still confirmed but under new tip.
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Drop OnceCell in lightning-transaction-sync tests#2132

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

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 28, 2023
 Merged


Drop OnceCell in lightning-transaction-sync tests
#2132
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f75ad80

Move test `bitcoind`/`electrsd` out of `OnceCell`


tnull Mar 27, 2023
7b85eba

Remove unnecessary restriction on `esplora-client` version


tnull Mar 27, 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


3 changes: 1 addition & 2 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,11 @@ lightning = { version = "0.0.114", path = "../lightning", default-features = fal
bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
esplora-client = { version = "0.3", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
electrum-client = "0.12.0"
once_cell = "1.16.0"
tokio = { version = "1.14.0", features = ["full"] }

147 changes: 60 additions & 87 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,78 +12,61 @@ use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
use bitcoind::bitcoincore_rpc::RpcApi;
use electrum_client::ElectrumApi;

use once_cell::sync::OnceCell;

use std::env;
use std::sync::Mutex;
use std::time::Duration;
use std::collections::{HashMap, HashSet};

static BITCOIND: OnceCell<BitcoinD> = OnceCell::new();
static ELECTRSD: OnceCell<ElectrsD> = OnceCell::new();
static PREMINE: OnceCell<()> = OnceCell::new();
static MINER_LOCK: OnceCell<Mutex<()>> = OnceCell::new();

fn get_bitcoind() -> &'static BitcoinD {
	BITCOIND.get_or_init(|| {
 let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
 let mut conf = bitcoind::Conf::default();
 conf.network = "regtest";
 let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 bitcoind
	})
}

fn get_electrsd() -> &'static ElectrsD {
	ELECTRSD.get_or_init(|| {
 let bitcoind = get_bitcoind();
 let electrs_exe =
 env::var("ELECTRS_EXE").ok().or_else(electrsd::downloaded_exe_path).expect(
 "you need to provide env var ELECTRS_EXE or specify an electrsd version feature",
 );
 let mut conf = electrsd::Conf::default();
 conf.http_enabled = true;
 conf.network = "regtest";
 let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 electrsd
	})
pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
	let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
	let mut bitcoind_conf = bitcoind::Conf::default();
	bitcoind_conf.network = "regtest";
	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();

	let electrs_exe = env::var("ELECTRS_EXE")
 .ok()
 .or_else(electrsd::downloaded_exe_path)
 .expect("you need to provide env var ELECTRS_EXE or specify an electrsd version feature");
	let mut electrsd_conf = electrsd::Conf::default();
	electrsd_conf.http_enabled = true;
	electrsd_conf.network = "regtest";
	let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &electrsd_conf).unwrap();
	(bitcoind, electrsd)
}

fn generate_blocks_and_wait(num: usize) {
	let miner_lock = MINER_LOCK.get_or_init(|| Mutex::new(()));
	let _miner = miner_lock.lock().unwrap();
	let cur_height = get_bitcoind().client.get_block_count().expect("failed to get current block height");
	let address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).expect("failed to get new address");
pub fn generate_blocks_and_wait(bitcoind: &BitcoinD, electrsd: &ElectrsD, num: usize) {
	let cur_height = bitcoind.client.get_block_count().expect("failed to get current block height");
	let address = bitcoind
 .client
 .get_new_address(Some("test"), Some(AddressType::Legacy))
 .expect("failed to get new address");
	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
	let _block_hashes_res = get_bitcoind().client.generate_to_address(num as u64, &address);
	wait_for_block(cur_height as usize + num);
	let _block_hashes_res = bitcoind.client.generate_to_address(num as u64, &address);
	wait_for_block(electrsd, cur_height as usize + num);
}

fn wait_for_block(min_height: usize) {
	let mut header = match get_electrsd().client.block_headers_subscribe() {
pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
	let mut header = match electrsd.client.block_headers_subscribe() {
 Ok(header) => header,
 Err(_) => {
 // While subscribing should succeed the first time around, we ran into some cases where
 // it didn't. Since we can't proceed without subscribing, we try again after a delay
 // and panic if it still fails.
 std::thread::sleep(Duration::from_secs(1));
get_electrsd().client.block_headers_subscribe().expect("failed to subscribe to block headers")
electrsd.client.block_headers_subscribe().expect("failed to subscribe to block headers")
 }
	};

	loop {
 if header.height >= min_height {
 break;
 }
 header = exponential_backoff_poll(|| {
get_electrsd().trigger().expect("failed to trigger electrsd");
get_electrsd().client.ping().expect("failed to ping electrsd");
get_electrsd().client.block_headers_pop().expect("failed to pop block header")
electrsd.trigger().expect("failed to trigger electrsd");
electrsd.client.ping().expect("failed to ping electrsd");
electrsd.client.block_headers_pop().expect("failed to pop block header")
 });
	}
}
Expand All@@ -109,12 +92,6 @@ where
	}
}

fn premine() {
	PREMINE.get_or_init(|| {
 generate_blocks_and_wait(101);
	});
}

#[derive(Debug)]
enum TestConfirmableEvent {
	Confirmed(Txid, BlockHash, u32),
Expand DownExpand Up@@ -182,27 +159,25 @@ impl Logger for TestLogger {
#[test]
#[cfg(feature = "esplora-blocking")]
fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).unwrap();
Expand All@@ -212,7 +187,7 @@ fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -221,19 +196,19 @@ fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();

	// Transaction still confirmed but under new tip.
Expand DownExpand Up@@ -267,27 +242,25 @@ fn test_esplora_syncs() {
#[tokio::test]
#[cfg(feature = "esplora-async")]
async fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).await.unwrap();
Expand All@@ -297,7 +270,7 @@ async fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -306,19 +279,19 @@ async fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	// Transaction still confirmed but under new tip.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Drop OnceCell in lightning-transaction-sync tests#2132

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

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 28, 2023
 Merged


Drop OnceCell in lightning-transaction-sync tests
#2132
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f75ad80

Move test `bitcoind`/`electrsd` out of `OnceCell`


tnull Mar 27, 2023
7b85eba

Remove unnecessary restriction on `esplora-client` version


tnull Mar 27, 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


3 changes: 1 addition & 2 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,11 @@ lightning = { version = "0.0.114", path = "../lightning", default-features = fal
bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
esplora-client = { version = "0.3", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
electrum-client = "0.12.0"
once_cell = "1.16.0"
tokio = { version = "1.14.0", features = ["full"] }

147 changes: 60 additions & 87 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,78 +12,61 @@ use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
use bitcoind::bitcoincore_rpc::RpcApi;
use electrum_client::ElectrumApi;

use once_cell::sync::OnceCell;

use std::env;
use std::sync::Mutex;
use std::time::Duration;
use std::collections::{HashMap, HashSet};

static BITCOIND: OnceCell<BitcoinD> = OnceCell::new();
static ELECTRSD: OnceCell<ElectrsD> = OnceCell::new();
static PREMINE: OnceCell<()> = OnceCell::new();
static MINER_LOCK: OnceCell<Mutex<()>> = OnceCell::new();

fn get_bitcoind() -> &'static BitcoinD {
	BITCOIND.get_or_init(|| {
 let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
 let mut conf = bitcoind::Conf::default();
 conf.network = "regtest";
 let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 bitcoind
	})
}

fn get_electrsd() -> &'static ElectrsD {
	ELECTRSD.get_or_init(|| {
 let bitcoind = get_bitcoind();
 let electrs_exe =
 env::var("ELECTRS_EXE").ok().or_else(electrsd::downloaded_exe_path).expect(
 "you need to provide env var ELECTRS_EXE or specify an electrsd version feature",
 );
 let mut conf = electrsd::Conf::default();
 conf.http_enabled = true;
 conf.network = "regtest";
 let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 electrsd
	})
pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
	let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
	let mut bitcoind_conf = bitcoind::Conf::default();
	bitcoind_conf.network = "regtest";
	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();

	let electrs_exe = env::var("ELECTRS_EXE")
 .ok()
 .or_else(electrsd::downloaded_exe_path)
 .expect("you need to provide env var ELECTRS_EXE or specify an electrsd version feature");
	let mut electrsd_conf = electrsd::Conf::default();
	electrsd_conf.http_enabled = true;
	electrsd_conf.network = "regtest";
	let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &electrsd_conf).unwrap();
	(bitcoind, electrsd)
}

fn generate_blocks_and_wait(num: usize) {
	let miner_lock = MINER_LOCK.get_or_init(|| Mutex::new(()));
	let _miner = miner_lock.lock().unwrap();
	let cur_height = get_bitcoind().client.get_block_count().expect("failed to get current block height");
	let address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).expect("failed to get new address");
pub fn generate_blocks_and_wait(bitcoind: &BitcoinD, electrsd: &ElectrsD, num: usize) {
	let cur_height = bitcoind.client.get_block_count().expect("failed to get current block height");
	let address = bitcoind
 .client
 .get_new_address(Some("test"), Some(AddressType::Legacy))
 .expect("failed to get new address");
	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
	let _block_hashes_res = get_bitcoind().client.generate_to_address(num as u64, &address);
	wait_for_block(cur_height as usize + num);
	let _block_hashes_res = bitcoind.client.generate_to_address(num as u64, &address);
	wait_for_block(electrsd, cur_height as usize + num);
}

fn wait_for_block(min_height: usize) {
	let mut header = match get_electrsd().client.block_headers_subscribe() {
pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
	let mut header = match electrsd.client.block_headers_subscribe() {
 Ok(header) => header,
 Err(_) => {
 // While subscribing should succeed the first time around, we ran into some cases where
 // it didn't. Since we can't proceed without subscribing, we try again after a delay
 // and panic if it still fails.
 std::thread::sleep(Duration::from_secs(1));
get_electrsd().client.block_headers_subscribe().expect("failed to subscribe to block headers")
electrsd.client.block_headers_subscribe().expect("failed to subscribe to block headers")
 }
	};

	loop {
 if header.height >= min_height {
 break;
 }
 header = exponential_backoff_poll(|| {
get_electrsd().trigger().expect("failed to trigger electrsd");
get_electrsd().client.ping().expect("failed to ping electrsd");
get_electrsd().client.block_headers_pop().expect("failed to pop block header")
electrsd.trigger().expect("failed to trigger electrsd");
electrsd.client.ping().expect("failed to ping electrsd");
electrsd.client.block_headers_pop().expect("failed to pop block header")
 });
	}
}
Expand All@@ -109,12 +92,6 @@ where
	}
}

fn premine() {
	PREMINE.get_or_init(|| {
 generate_blocks_and_wait(101);
	});
}

#[derive(Debug)]
enum TestConfirmableEvent {
	Confirmed(Txid, BlockHash, u32),
Expand DownExpand Up@@ -182,27 +159,25 @@ impl Logger for TestLogger {
#[test]
#[cfg(feature = "esplora-blocking")]
fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).unwrap();
Expand All@@ -212,7 +187,7 @@ fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -221,19 +196,19 @@ fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();

	// Transaction still confirmed but under new tip.
Expand DownExpand Up@@ -267,27 +242,25 @@ fn test_esplora_syncs() {
#[tokio::test]
#[cfg(feature = "esplora-async")]
async fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).await.unwrap();
Expand All@@ -297,7 +270,7 @@ async fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -306,19 +279,19 @@ async fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	// Transaction still confirmed but under new tip.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Drop OnceCell in lightning-transaction-sync tests#2132

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

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 28, 2023
 Merged


Drop OnceCell in lightning-transaction-sync tests
#2132
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f75ad80

Move test `bitcoind`/`electrsd` out of `OnceCell`


tnull Mar 27, 2023
7b85eba

Remove unnecessary restriction on `esplora-client` version


tnull Mar 27, 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


3 changes: 1 addition & 2 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,11 @@ lightning = { version = "0.0.114", path = "../lightning", default-features = fal
bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
esplora-client = { version = "0.3", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
electrum-client = "0.12.0"
once_cell = "1.16.0"
tokio = { version = "1.14.0", features = ["full"] }

147 changes: 60 additions & 87 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,78 +12,61 @@ use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
use bitcoind::bitcoincore_rpc::RpcApi;
use electrum_client::ElectrumApi;

use once_cell::sync::OnceCell;

use std::env;
use std::sync::Mutex;
use std::time::Duration;
use std::collections::{HashMap, HashSet};

static BITCOIND: OnceCell<BitcoinD> = OnceCell::new();
static ELECTRSD: OnceCell<ElectrsD> = OnceCell::new();
static PREMINE: OnceCell<()> = OnceCell::new();
static MINER_LOCK: OnceCell<Mutex<()>> = OnceCell::new();

fn get_bitcoind() -> &'static BitcoinD {
	BITCOIND.get_or_init(|| {
 let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
 let mut conf = bitcoind::Conf::default();
 conf.network = "regtest";
 let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 bitcoind
	})
}

fn get_electrsd() -> &'static ElectrsD {
	ELECTRSD.get_or_init(|| {
 let bitcoind = get_bitcoind();
 let electrs_exe =
 env::var("ELECTRS_EXE").ok().or_else(electrsd::downloaded_exe_path).expect(
 "you need to provide env var ELECTRS_EXE or specify an electrsd version feature",
 );
 let mut conf = electrsd::Conf::default();
 conf.http_enabled = true;
 conf.network = "regtest";
 let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 electrsd
	})
pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
	let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
	let mut bitcoind_conf = bitcoind::Conf::default();
	bitcoind_conf.network = "regtest";
	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();

	let electrs_exe = env::var("ELECTRS_EXE")
 .ok()
 .or_else(electrsd::downloaded_exe_path)
 .expect("you need to provide env var ELECTRS_EXE or specify an electrsd version feature");
	let mut electrsd_conf = electrsd::Conf::default();
	electrsd_conf.http_enabled = true;
	electrsd_conf.network = "regtest";
	let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &electrsd_conf).unwrap();
	(bitcoind, electrsd)
}

fn generate_blocks_and_wait(num: usize) {
	let miner_lock = MINER_LOCK.get_or_init(|| Mutex::new(()));
	let _miner = miner_lock.lock().unwrap();
	let cur_height = get_bitcoind().client.get_block_count().expect("failed to get current block height");
	let address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).expect("failed to get new address");
pub fn generate_blocks_and_wait(bitcoind: &BitcoinD, electrsd: &ElectrsD, num: usize) {
	let cur_height = bitcoind.client.get_block_count().expect("failed to get current block height");
	let address = bitcoind
 .client
 .get_new_address(Some("test"), Some(AddressType::Legacy))
 .expect("failed to get new address");
	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
	let _block_hashes_res = get_bitcoind().client.generate_to_address(num as u64, &address);
	wait_for_block(cur_height as usize + num);
	let _block_hashes_res = bitcoind.client.generate_to_address(num as u64, &address);
	wait_for_block(electrsd, cur_height as usize + num);
}

fn wait_for_block(min_height: usize) {
	let mut header = match get_electrsd().client.block_headers_subscribe() {
pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
	let mut header = match electrsd.client.block_headers_subscribe() {
 Ok(header) => header,
 Err(_) => {
 // While subscribing should succeed the first time around, we ran into some cases where
 // it didn't. Since we can't proceed without subscribing, we try again after a delay
 // and panic if it still fails.
 std::thread::sleep(Duration::from_secs(1));
get_electrsd().client.block_headers_subscribe().expect("failed to subscribe to block headers")
electrsd.client.block_headers_subscribe().expect("failed to subscribe to block headers")
 }
	};

	loop {
 if header.height >= min_height {
 break;
 }
 header = exponential_backoff_poll(|| {
get_electrsd().trigger().expect("failed to trigger electrsd");
get_electrsd().client.ping().expect("failed to ping electrsd");
get_electrsd().client.block_headers_pop().expect("failed to pop block header")
electrsd.trigger().expect("failed to trigger electrsd");
electrsd.client.ping().expect("failed to ping electrsd");
electrsd.client.block_headers_pop().expect("failed to pop block header")
 });
	}
}
Expand All@@ -109,12 +92,6 @@ where
	}
}

fn premine() {
	PREMINE.get_or_init(|| {
 generate_blocks_and_wait(101);
	});
}

#[derive(Debug)]
enum TestConfirmableEvent {
	Confirmed(Txid, BlockHash, u32),
Expand DownExpand Up@@ -182,27 +159,25 @@ impl Logger for TestLogger {
#[test]
#[cfg(feature = "esplora-blocking")]
fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).unwrap();
Expand All@@ -212,7 +187,7 @@ fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -221,19 +196,19 @@ fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();

	// Transaction still confirmed but under new tip.
Expand DownExpand Up@@ -267,27 +242,25 @@ fn test_esplora_syncs() {
#[tokio::test]
#[cfg(feature = "esplora-async")]
async fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).await.unwrap();
Expand All@@ -297,7 +270,7 @@ async fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -306,19 +279,19 @@ async fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	// Transaction still confirmed but under new tip.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Drop OnceCell in lightning-transaction-sync tests#2132

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

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 28, 2023
 Merged


Drop OnceCell in lightning-transaction-sync tests
#2132
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f75ad80

Move test `bitcoind`/`electrsd` out of `OnceCell`


tnull Mar 27, 2023
7b85eba

Remove unnecessary restriction on `esplora-client` version


tnull Mar 27, 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


3 changes: 1 addition & 2 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,11 @@ lightning = { version = "0.0.114", path = "../lightning", default-features = fal
bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
esplora-client = { version = "0.3", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
electrum-client = "0.12.0"
once_cell = "1.16.0"
tokio = { version = "1.14.0", features = ["full"] }

147 changes: 60 additions & 87 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,78 +12,61 @@ use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
use bitcoind::bitcoincore_rpc::RpcApi;
use electrum_client::ElectrumApi;

use once_cell::sync::OnceCell;

use std::env;
use std::sync::Mutex;
use std::time::Duration;
use std::collections::{HashMap, HashSet};

static BITCOIND: OnceCell<BitcoinD> = OnceCell::new();
static ELECTRSD: OnceCell<ElectrsD> = OnceCell::new();
static PREMINE: OnceCell<()> = OnceCell::new();
static MINER_LOCK: OnceCell<Mutex<()>> = OnceCell::new();

fn get_bitcoind() -> &'static BitcoinD {
	BITCOIND.get_or_init(|| {
 let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
 let mut conf = bitcoind::Conf::default();
 conf.network = "regtest";
 let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 bitcoind
	})
}

fn get_electrsd() -> &'static ElectrsD {
	ELECTRSD.get_or_init(|| {
 let bitcoind = get_bitcoind();
 let electrs_exe =
 env::var("ELECTRS_EXE").ok().or_else(electrsd::downloaded_exe_path).expect(
 "you need to provide env var ELECTRS_EXE or specify an electrsd version feature",
 );
 let mut conf = electrsd::Conf::default();
 conf.http_enabled = true;
 conf.network = "regtest";
 let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 electrsd
	})
pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
	let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
	let mut bitcoind_conf = bitcoind::Conf::default();
	bitcoind_conf.network = "regtest";
	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();

	let electrs_exe = env::var("ELECTRS_EXE")
 .ok()
 .or_else(electrsd::downloaded_exe_path)
 .expect("you need to provide env var ELECTRS_EXE or specify an electrsd version feature");
	let mut electrsd_conf = electrsd::Conf::default();
	electrsd_conf.http_enabled = true;
	electrsd_conf.network = "regtest";
	let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &electrsd_conf).unwrap();
	(bitcoind, electrsd)
}

fn generate_blocks_and_wait(num: usize) {
	let miner_lock = MINER_LOCK.get_or_init(|| Mutex::new(()));
	let _miner = miner_lock.lock().unwrap();
	let cur_height = get_bitcoind().client.get_block_count().expect("failed to get current block height");
	let address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).expect("failed to get new address");
pub fn generate_blocks_and_wait(bitcoind: &BitcoinD, electrsd: &ElectrsD, num: usize) {
	let cur_height = bitcoind.client.get_block_count().expect("failed to get current block height");
	let address = bitcoind
 .client
 .get_new_address(Some("test"), Some(AddressType::Legacy))
 .expect("failed to get new address");
	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
	let _block_hashes_res = get_bitcoind().client.generate_to_address(num as u64, &address);
	wait_for_block(cur_height as usize + num);
	let _block_hashes_res = bitcoind.client.generate_to_address(num as u64, &address);
	wait_for_block(electrsd, cur_height as usize + num);
}

fn wait_for_block(min_height: usize) {
	let mut header = match get_electrsd().client.block_headers_subscribe() {
pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
	let mut header = match electrsd.client.block_headers_subscribe() {
 Ok(header) => header,
 Err(_) => {
 // While subscribing should succeed the first time around, we ran into some cases where
 // it didn't. Since we can't proceed without subscribing, we try again after a delay
 // and panic if it still fails.
 std::thread::sleep(Duration::from_secs(1));
get_electrsd().client.block_headers_subscribe().expect("failed to subscribe to block headers")
electrsd.client.block_headers_subscribe().expect("failed to subscribe to block headers")
 }
	};

	loop {
 if header.height >= min_height {
 break;
 }
 header = exponential_backoff_poll(|| {
get_electrsd().trigger().expect("failed to trigger electrsd");
get_electrsd().client.ping().expect("failed to ping electrsd");
get_electrsd().client.block_headers_pop().expect("failed to pop block header")
electrsd.trigger().expect("failed to trigger electrsd");
electrsd.client.ping().expect("failed to ping electrsd");
electrsd.client.block_headers_pop().expect("failed to pop block header")
 });
	}
}
Expand All@@ -109,12 +92,6 @@ where
	}
}

fn premine() {
	PREMINE.get_or_init(|| {
 generate_blocks_and_wait(101);
	});
}

#[derive(Debug)]
enum TestConfirmableEvent {
	Confirmed(Txid, BlockHash, u32),
Expand DownExpand Up@@ -182,27 +159,25 @@ impl Logger for TestLogger {
#[test]
#[cfg(feature = "esplora-blocking")]
fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).unwrap();
Expand All@@ -212,7 +187,7 @@ fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -221,19 +196,19 @@ fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();

	// Transaction still confirmed but under new tip.
Expand DownExpand Up@@ -267,27 +242,25 @@ fn test_esplora_syncs() {
#[tokio::test]
#[cfg(feature = "esplora-async")]
async fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).await.unwrap();
Expand All@@ -297,7 +270,7 @@ async fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -306,19 +279,19 @@ async fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	// Transaction still confirmed but under new tip.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Drop OnceCell in lightning-transaction-sync tests#2132

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

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 28, 2023
 Merged


Drop OnceCell in lightning-transaction-sync tests
#2132
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f75ad80

Move test `bitcoind`/`electrsd` out of `OnceCell`


tnull Mar 27, 2023
7b85eba

Remove unnecessary restriction on `esplora-client` version


tnull Mar 27, 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


3 changes: 1 addition & 2 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,11 @@ lightning = { version = "0.0.114", path = "../lightning", default-features = fal
bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
esplora-client = { version = "0.3", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
electrum-client = "0.12.0"
once_cell = "1.16.0"
tokio = { version = "1.14.0", features = ["full"] }

147 changes: 60 additions & 87 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,78 +12,61 @@ use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
use bitcoind::bitcoincore_rpc::RpcApi;
use electrum_client::ElectrumApi;

use once_cell::sync::OnceCell;

use std::env;
use std::sync::Mutex;
use std::time::Duration;
use std::collections::{HashMap, HashSet};

static BITCOIND: OnceCell<BitcoinD> = OnceCell::new();
static ELECTRSD: OnceCell<ElectrsD> = OnceCell::new();
static PREMINE: OnceCell<()> = OnceCell::new();
static MINER_LOCK: OnceCell<Mutex<()>> = OnceCell::new();

fn get_bitcoind() -> &'static BitcoinD {
	BITCOIND.get_or_init(|| {
 let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
 let mut conf = bitcoind::Conf::default();
 conf.network = "regtest";
 let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 bitcoind
	})
}

fn get_electrsd() -> &'static ElectrsD {
	ELECTRSD.get_or_init(|| {
 let bitcoind = get_bitcoind();
 let electrs_exe =
 env::var("ELECTRS_EXE").ok().or_else(electrsd::downloaded_exe_path).expect(
 "you need to provide env var ELECTRS_EXE or specify an electrsd version feature",
 );
 let mut conf = electrsd::Conf::default();
 conf.http_enabled = true;
 conf.network = "regtest";
 let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 electrsd
	})
pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
	let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
	let mut bitcoind_conf = bitcoind::Conf::default();
	bitcoind_conf.network = "regtest";
	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();

	let electrs_exe = env::var("ELECTRS_EXE")
 .ok()
 .or_else(electrsd::downloaded_exe_path)
 .expect("you need to provide env var ELECTRS_EXE or specify an electrsd version feature");
	let mut electrsd_conf = electrsd::Conf::default();
	electrsd_conf.http_enabled = true;
	electrsd_conf.network = "regtest";
	let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &electrsd_conf).unwrap();
	(bitcoind, electrsd)
}

fn generate_blocks_and_wait(num: usize) {
	let miner_lock = MINER_LOCK.get_or_init(|| Mutex::new(()));
	let _miner = miner_lock.lock().unwrap();
	let cur_height = get_bitcoind().client.get_block_count().expect("failed to get current block height");
	let address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).expect("failed to get new address");
pub fn generate_blocks_and_wait(bitcoind: &BitcoinD, electrsd: &ElectrsD, num: usize) {
	let cur_height = bitcoind.client.get_block_count().expect("failed to get current block height");
	let address = bitcoind
 .client
 .get_new_address(Some("test"), Some(AddressType::Legacy))
 .expect("failed to get new address");
	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
	let _block_hashes_res = get_bitcoind().client.generate_to_address(num as u64, &address);
	wait_for_block(cur_height as usize + num);
	let _block_hashes_res = bitcoind.client.generate_to_address(num as u64, &address);
	wait_for_block(electrsd, cur_height as usize + num);
}

fn wait_for_block(min_height: usize) {
	let mut header = match get_electrsd().client.block_headers_subscribe() {
pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
	let mut header = match electrsd.client.block_headers_subscribe() {
 Ok(header) => header,
 Err(_) => {
 // While subscribing should succeed the first time around, we ran into some cases where
 // it didn't. Since we can't proceed without subscribing, we try again after a delay
 // and panic if it still fails.
 std::thread::sleep(Duration::from_secs(1));
get_electrsd().client.block_headers_subscribe().expect("failed to subscribe to block headers")
electrsd.client.block_headers_subscribe().expect("failed to subscribe to block headers")
 }
	};

	loop {
 if header.height >= min_height {
 break;
 }
 header = exponential_backoff_poll(|| {
get_electrsd().trigger().expect("failed to trigger electrsd");
get_electrsd().client.ping().expect("failed to ping electrsd");
get_electrsd().client.block_headers_pop().expect("failed to pop block header")
electrsd.trigger().expect("failed to trigger electrsd");
electrsd.client.ping().expect("failed to ping electrsd");
electrsd.client.block_headers_pop().expect("failed to pop block header")
 });
	}
}
Expand All@@ -109,12 +92,6 @@ where
	}
}

fn premine() {
	PREMINE.get_or_init(|| {
 generate_blocks_and_wait(101);
	});
}

#[derive(Debug)]
enum TestConfirmableEvent {
	Confirmed(Txid, BlockHash, u32),
Expand DownExpand Up@@ -182,27 +159,25 @@ impl Logger for TestLogger {
#[test]
#[cfg(feature = "esplora-blocking")]
fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).unwrap();
Expand All@@ -212,7 +187,7 @@ fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -221,19 +196,19 @@ fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();

	// Transaction still confirmed but under new tip.
Expand DownExpand Up@@ -267,27 +242,25 @@ fn test_esplora_syncs() {
#[tokio::test]
#[cfg(feature = "esplora-async")]
async fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).await.unwrap();
Expand All@@ -297,7 +270,7 @@ async fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -306,19 +279,19 @@ async fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	// Transaction still confirmed but under new tip.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Drop OnceCell in lightning-transaction-sync tests#2132

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

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 28, 2023
 Merged


Drop OnceCell in lightning-transaction-sync tests
#2132
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f75ad80

Move test `bitcoind`/`electrsd` out of `OnceCell`


tnull Mar 27, 2023
7b85eba

Remove unnecessary restriction on `esplora-client` version


tnull Mar 27, 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


3 changes: 1 addition & 2 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,11 @@ lightning = { version = "0.0.114", path = "../lightning", default-features = fal
bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
esplora-client = { version = "0.3", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
electrum-client = "0.12.0"
once_cell = "1.16.0"
tokio = { version = "1.14.0", features = ["full"] }

147 changes: 60 additions & 87 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,78 +12,61 @@ use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
use bitcoind::bitcoincore_rpc::RpcApi;
use electrum_client::ElectrumApi;

use once_cell::sync::OnceCell;

use std::env;
use std::sync::Mutex;
use std::time::Duration;
use std::collections::{HashMap, HashSet};

static BITCOIND: OnceCell<BitcoinD> = OnceCell::new();
static ELECTRSD: OnceCell<ElectrsD> = OnceCell::new();
static PREMINE: OnceCell<()> = OnceCell::new();
static MINER_LOCK: OnceCell<Mutex<()>> = OnceCell::new();

fn get_bitcoind() -> &'static BitcoinD {
	BITCOIND.get_or_init(|| {
 let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
 let mut conf = bitcoind::Conf::default();
 conf.network = "regtest";
 let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 bitcoind
	})
}

fn get_electrsd() -> &'static ElectrsD {
	ELECTRSD.get_or_init(|| {
 let bitcoind = get_bitcoind();
 let electrs_exe =
 env::var("ELECTRS_EXE").ok().or_else(electrsd::downloaded_exe_path).expect(
 "you need to provide env var ELECTRS_EXE or specify an electrsd version feature",
 );
 let mut conf = electrsd::Conf::default();
 conf.http_enabled = true;
 conf.network = "regtest";
 let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 electrsd
	})
pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
	let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
	let mut bitcoind_conf = bitcoind::Conf::default();
	bitcoind_conf.network = "regtest";
	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();

	let electrs_exe = env::var("ELECTRS_EXE")
 .ok()
 .or_else(electrsd::downloaded_exe_path)
 .expect("you need to provide env var ELECTRS_EXE or specify an electrsd version feature");
	let mut electrsd_conf = electrsd::Conf::default();
	electrsd_conf.http_enabled = true;
	electrsd_conf.network = "regtest";
	let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &electrsd_conf).unwrap();
	(bitcoind, electrsd)
}

fn generate_blocks_and_wait(num: usize) {
	let miner_lock = MINER_LOCK.get_or_init(|| Mutex::new(()));
	let _miner = miner_lock.lock().unwrap();
	let cur_height = get_bitcoind().client.get_block_count().expect("failed to get current block height");
	let address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).expect("failed to get new address");
pub fn generate_blocks_and_wait(bitcoind: &BitcoinD, electrsd: &ElectrsD, num: usize) {
	let cur_height = bitcoind.client.get_block_count().expect("failed to get current block height");
	let address = bitcoind
 .client
 .get_new_address(Some("test"), Some(AddressType::Legacy))
 .expect("failed to get new address");
	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
	let _block_hashes_res = get_bitcoind().client.generate_to_address(num as u64, &address);
	wait_for_block(cur_height as usize + num);
	let _block_hashes_res = bitcoind.client.generate_to_address(num as u64, &address);
	wait_for_block(electrsd, cur_height as usize + num);
}

fn wait_for_block(min_height: usize) {
	let mut header = match get_electrsd().client.block_headers_subscribe() {
pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
	let mut header = match electrsd.client.block_headers_subscribe() {
 Ok(header) => header,
 Err(_) => {
 // While subscribing should succeed the first time around, we ran into some cases where
 // it didn't. Since we can't proceed without subscribing, we try again after a delay
 // and panic if it still fails.
 std::thread::sleep(Duration::from_secs(1));
get_electrsd().client.block_headers_subscribe().expect("failed to subscribe to block headers")
electrsd.client.block_headers_subscribe().expect("failed to subscribe to block headers")
 }
	};

	loop {
 if header.height >= min_height {
 break;
 }
 header = exponential_backoff_poll(|| {
get_electrsd().trigger().expect("failed to trigger electrsd");
get_electrsd().client.ping().expect("failed to ping electrsd");
get_electrsd().client.block_headers_pop().expect("failed to pop block header")
electrsd.trigger().expect("failed to trigger electrsd");
electrsd.client.ping().expect("failed to ping electrsd");
electrsd.client.block_headers_pop().expect("failed to pop block header")
 });
	}
}
Expand All@@ -109,12 +92,6 @@ where
	}
}

fn premine() {
	PREMINE.get_or_init(|| {
 generate_blocks_and_wait(101);
	});
}

#[derive(Debug)]
enum TestConfirmableEvent {
	Confirmed(Txid, BlockHash, u32),
Expand DownExpand Up@@ -182,27 +159,25 @@ impl Logger for TestLogger {
#[test]
#[cfg(feature = "esplora-blocking")]
fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).unwrap();
Expand All@@ -212,7 +187,7 @@ fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -221,19 +196,19 @@ fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();

	// Transaction still confirmed but under new tip.
Expand DownExpand Up@@ -267,27 +242,25 @@ fn test_esplora_syncs() {
#[tokio::test]
#[cfg(feature = "esplora-async")]
async fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).await.unwrap();
Expand All@@ -297,7 +270,7 @@ async fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -306,19 +279,19 @@ async fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	// Transaction still confirmed but under new tip.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Drop OnceCell in lightning-transaction-sync tests#2132

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

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 28, 2023
 Merged


Drop OnceCell in lightning-transaction-sync tests
#2132
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f75ad80

Move test `bitcoind`/`electrsd` out of `OnceCell`


tnull Mar 27, 2023
7b85eba

Remove unnecessary restriction on `esplora-client` version


tnull Mar 27, 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


3 changes: 1 addition & 2 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,11 @@ lightning = { version = "0.0.114", path = "../lightning", default-features = fal
bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
esplora-client = { version = "0.3", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
electrum-client = "0.12.0"
once_cell = "1.16.0"
tokio = { version = "1.14.0", features = ["full"] }

147 changes: 60 additions & 87 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,78 +12,61 @@ use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
use bitcoind::bitcoincore_rpc::RpcApi;
use electrum_client::ElectrumApi;

use once_cell::sync::OnceCell;

use std::env;
use std::sync::Mutex;
use std::time::Duration;
use std::collections::{HashMap, HashSet};

static BITCOIND: OnceCell<BitcoinD> = OnceCell::new();
static ELECTRSD: OnceCell<ElectrsD> = OnceCell::new();
static PREMINE: OnceCell<()> = OnceCell::new();
static MINER_LOCK: OnceCell<Mutex<()>> = OnceCell::new();

fn get_bitcoind() -> &'static BitcoinD {
	BITCOIND.get_or_init(|| {
 let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
 let mut conf = bitcoind::Conf::default();
 conf.network = "regtest";
 let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 bitcoind
	})
}

fn get_electrsd() -> &'static ElectrsD {
	ELECTRSD.get_or_init(|| {
 let bitcoind = get_bitcoind();
 let electrs_exe =
 env::var("ELECTRS_EXE").ok().or_else(electrsd::downloaded_exe_path).expect(
 "you need to provide env var ELECTRS_EXE or specify an electrsd version feature",
 );
 let mut conf = electrsd::Conf::default();
 conf.http_enabled = true;
 conf.network = "regtest";
 let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &conf).unwrap();
 std::thread::sleep(Duration::from_secs(1));
 electrsd
	})
pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
	let bitcoind_exe =
 env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
 "you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 );
	let mut bitcoind_conf = bitcoind::Conf::default();
	bitcoind_conf.network = "regtest";
	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();

	let electrs_exe = env::var("ELECTRS_EXE")
 .ok()
 .or_else(electrsd::downloaded_exe_path)
 .expect("you need to provide env var ELECTRS_EXE or specify an electrsd version feature");
	let mut electrsd_conf = electrsd::Conf::default();
	electrsd_conf.http_enabled = true;
	electrsd_conf.network = "regtest";
	let electrsd = ElectrsD::with_conf(electrs_exe, &bitcoind, &electrsd_conf).unwrap();
	(bitcoind, electrsd)
}

fn generate_blocks_and_wait(num: usize) {
	let miner_lock = MINER_LOCK.get_or_init(|| Mutex::new(()));
	let _miner = miner_lock.lock().unwrap();
	let cur_height = get_bitcoind().client.get_block_count().expect("failed to get current block height");
	let address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).expect("failed to get new address");
pub fn generate_blocks_and_wait(bitcoind: &BitcoinD, electrsd: &ElectrsD, num: usize) {
	let cur_height = bitcoind.client.get_block_count().expect("failed to get current block height");
	let address = bitcoind
 .client
 .get_new_address(Some("test"), Some(AddressType::Legacy))
 .expect("failed to get new address");
	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
	let _block_hashes_res = get_bitcoind().client.generate_to_address(num as u64, &address);
	wait_for_block(cur_height as usize + num);
	let _block_hashes_res = bitcoind.client.generate_to_address(num as u64, &address);
	wait_for_block(electrsd, cur_height as usize + num);
}

fn wait_for_block(min_height: usize) {
	let mut header = match get_electrsd().client.block_headers_subscribe() {
pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
	let mut header = match electrsd.client.block_headers_subscribe() {
 Ok(header) => header,
 Err(_) => {
 // While subscribing should succeed the first time around, we ran into some cases where
 // it didn't. Since we can't proceed without subscribing, we try again after a delay
 // and panic if it still fails.
 std::thread::sleep(Duration::from_secs(1));
get_electrsd().client.block_headers_subscribe().expect("failed to subscribe to block headers")
electrsd.client.block_headers_subscribe().expect("failed to subscribe to block headers")
 }
	};

	loop {
 if header.height >= min_height {
 break;
 }
 header = exponential_backoff_poll(|| {
get_electrsd().trigger().expect("failed to trigger electrsd");
get_electrsd().client.ping().expect("failed to ping electrsd");
get_electrsd().client.block_headers_pop().expect("failed to pop block header")
electrsd.trigger().expect("failed to trigger electrsd");
electrsd.client.ping().expect("failed to ping electrsd");
electrsd.client.block_headers_pop().expect("failed to pop block header")
 });
	}
}
Expand All@@ -109,12 +92,6 @@ where
	}
}

fn premine() {
	PREMINE.get_or_init(|| {
 generate_blocks_and_wait(101);
	});
}

#[derive(Debug)]
enum TestConfirmableEvent {
	Confirmed(Txid, BlockHash, u32),
Expand DownExpand Up@@ -182,27 +159,25 @@ impl Logger for TestLogger {
#[test]
#[cfg(feature = "esplora-blocking")]
fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).unwrap();
Expand All@@ -212,7 +187,7 @@ fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -221,19 +196,19 @@ fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).unwrap();

	// Transaction still confirmed but under new tip.
Expand DownExpand Up@@ -267,27 +242,25 @@ fn test_esplora_syncs() {
#[tokio::test]
#[cfg(feature = "esplora-async")]
async fn test_esplora_syncs() {
	premine();
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
	generate_blocks_and_wait(&bitcoind, &electrsd, 101);
	let mut logger = TestLogger {};
	let esplora_url = format!("http://{}", get_electrsd().esplora_url.as_ref().unwrap());
	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we pick up on new best blocks
	let expected_height = 0u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);

	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let expected_height = get_bitcoind().client.get_block_count().unwrap() as u32;
	assert_eq!(confirmable.best_block.lock().unwrap().1, expected_height);
	assert_eq!(confirmable.best_block.lock().unwrap().1, 102);

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 1);

	// Check registered confirmed transactions are marked confirmed
	let new_address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = get_bitcoind().client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
	tx_sync.register_tx(&txid, &new_address.script_pubkey());

	tx_sync.sync(vec![&confirmable]).await.unwrap();
Expand All@@ -297,7 +270,7 @@ async fn test_esplora_syncs() {
	assert!(confirmable.confirmed_txs.lock().unwrap().is_empty());
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	generate_blocks_and_wait(1);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
Expand All@@ -306,19 +279,19 @@ async fn test_esplora_syncs() {
	assert!(confirmable.unconfirmed_txs.lock().unwrap().is_empty());

	// Check previously confirmed transactions are marked unconfirmed when they are reorged.
	let best_block_hash = get_bitcoind().client.get_best_block_hash().unwrap();
get_bitcoind().client.invalidate_block(&best_block_hash).unwrap();
	let best_block_hash = bitcoind.client.get_best_block_hash().unwrap();
bitcoind.client.invalidate_block(&best_block_hash).unwrap();

	// We're getting back to the previous height with a new tip, but best block shouldn't change.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	let events = std::mem::take(&mut *confirmable.events.lock().unwrap());
	assert_eq!(events.len(), 0);

	// Now we're surpassing previous height, getting new tip.
	generate_blocks_and_wait(1);
	assert_ne!(get_bitcoind().client.get_best_block_hash().unwrap(), best_block_hash);
	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	assert_ne!(bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
	tx_sync.sync(vec![&confirmable]).await.unwrap();

	// Transaction still confirmed but under new tip.
Expand Down