f

Author: tnull

lightning-transaction-sync/tests/integration_tests.rs

@@ -47,11 +47,13 @@ pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
 }
 
 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").into_model().unwrap().0;
-	let address = bitcoind
+	let cur_height = bitcoind
 		.client
-		.new_address()
-		.expect("failed to get new address");
+		.get_block_count()
+		.expect("failed to get current block height")
+		.into_model()
+		.0;
+	let address = bitcoind.client.new_address().expect("failed to get new address");
 	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
 	let _block_hashes_res = bitcoind.client.generate_to_address(num, &address);
 	wait_for_block(electrsd, cur_height as usize + num);
@@ -174,10 +176,7 @@ macro_rules! test_syncing {
 		assert_eq!(events.len(), 1);
 
 		// Check registered confirmed transactions are marked confirmed
-		let new_address = $bitcoind
-			.client
-			.new_address()
-			.unwrap();
+		let new_address = $bitcoind.client.new_address().unwrap();
 		let txid = $bitcoind
 			.client
 			.send_to_address(&new_address, Amount::from_sat(5000))
@@ -214,12 +213,8 @@ macro_rules! test_syncing {
 		let block_hash = tx_res.block_hash.unwrap();
 		let tx = tx_res.tx;
 		let prev_outpoint = tx.input.first().unwrap().previous_output;
-		let prev_tx = $bitcoind
-			.client
-			.get_transaction(prev_outpoint.txid)
-			.unwrap()
-			.into_model()
-			.unwrap().tx;
+		let prev_tx =
+			$bitcoind.client.get_transaction(prev_outpoint.txid).unwrap().into_model().unwrap().tx;
 		let prev_script_pubkey = prev_tx.output[prev_outpoint.vout as usize].script_pubkey.clone();
 		let output = WatchedOutput {
 			block_hash: Some(block_hash),
@@ -237,19 +232,26 @@ macro_rules! test_syncing {
 		assert!($confirmable.unconfirmed_txs.lock().unwrap().is_empty());
 
 		// Check previously confirmed transactions are marked unconfirmed when they are reorged.
-		let best_block_hash = $bitcoind.client.get_best_block_hash().unwrap();
-		$bitcoind.client.invalidate_block(&best_block_hash).unwrap();
+		let best_block_hash =
+			$bitcoind.client.get_best_block_hash().unwrap().into_model().unwrap().0;
+		$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(&$bitcoind, &$electrsd, 1);
-		assert_ne!($bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
+		assert_ne!(
+			$bitcoind.client.get_best_block_hash().unwrap().into_model().unwrap().0,
+			best_block_hash
+		);
 		maybe_await!($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(&$bitcoind, &$electrsd, 1);
-		assert_ne!($bitcoind.client.get_best_block_hash().unwrap(), best_block_hash);
+		assert_ne!(
+			$bitcoind.client.get_best_block_hash().unwrap().into_model().unwrap().0,
+			best_block_hash
+		);
 		maybe_await!($tx_sync.sync(vec![&$confirmable])).unwrap();
 
 		// Transactions still confirmed but under new tip.