f Wait in tests for the funding txo to propagate

Author: tnull

src/tests/functional_tests.rs

@@ -1,7 +1,7 @@
 use crate::tests::test_utils::expect_event;
 use crate::{Builder, Config, Error, Event};
 
-use bitcoin::{Address, Amount};
+use bitcoin::{Address, Amount, Txid};
 use bitcoind::bitcoincore_rpc::RpcApi;
 use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
 use electrsd::{bitcoind, bitcoind::BitcoinD, ElectrsD};
@@ -69,6 +69,20 @@ fn wait_for_block(min_height: usize) {
 	}
 }
 
+fn wait_for_tx(txid: Txid) {
+	let mut tx_res = get_electrsd().client.transaction_get(&txid);
+	loop {
+		if tx_res.is_ok() {
+			break;
+		}
+		tx_res = exponential_backoff_poll(|| {
+			get_electrsd().trigger().unwrap();
+			get_electrsd().client.ping().unwrap();
+			Some(get_electrsd().client.transaction_get(&txid))
+		});
+	}
+}
+
 fn exponential_backoff_poll<T, F>(mut poll: F) -> T
 where
 	F: FnMut() -> Option<T>,
@@ -91,10 +105,11 @@ fn premine_and_distribute_funds(addrs: Vec<Address>, amount: Amount) {
 	});
 
 	for addr in addrs {
-		get_bitcoind()
+		let txid = get_bitcoind()
 			.client
 			.send_to_address(&addr, amount, None, None, None, None, None, None)
 			.unwrap();
+		wait_for_tx(txid);
 	}
 
 	generate_blocks_and_wait(1);
@@ -147,8 +162,17 @@ fn channel_full_cycle() {
 		format!("{}@{}", node_b.node_id().unwrap(), node_b.listening_address().unwrap());
 	node_a.connect_open_channel(&node_b_addr, 50000, true).unwrap();
 
-	// Wait a sec so the funding tx can 'propagate' via EsploraD to BitcoinD.
-	std::thread::sleep(Duration::from_secs(1));
+	let funding_txo = loop {
+		let details = node_a.list_channels();
+
+		if details.is_empty() || details[0].funding_txo.is_none() {
+			std::thread::sleep(Duration::from_secs(1));
+		} else {
+			break details[0].funding_txo.unwrap();
+		}
+	};
+
+	wait_for_tx(funding_txo.txid);
 
 	println!("\n .. generating blocks, syncing wallets .. ");
 	generate_blocks_and_wait(6);