fixup! Add end-to-end test for HRN resolution

Author: chuksys

tests/common/mod.rs

@@ -515,19 +515,19 @@ pub(crate) async fn generate_blocks_and_wait<E: ElectrumApi>(
 	let _ = bitcoind.create_wallet("ldk_node_test");
 	let _ = bitcoind.load_wallet("ldk_node_test");
 	print!("Generating {} blocks...", num);
-	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
-	let cur_height = blockchain_info.blocks;
+	//let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
+	let cur_height: usize = bitcoind.call("getblockcount", &[]).expect("failed to get block count");
 	let address = bitcoind.new_address().expect("failed to get new address");
 	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
 	let _block_hashes_res = bitcoind.generate_to_address(num, &address);
-	wait_for_block(electrs, cur_height as usize + num).await;
+	wait_for_block(electrs, cur_height + num).await;
 	print!(" Done!");
 	println!("\n");
 }
 
 pub(crate) fn invalidate_blocks(bitcoind: &BitcoindClient, num_blocks: usize) {
-	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
-	let cur_height = blockchain_info.blocks as usize;
+	//let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
+	let cur_height: usize = bitcoind.call("getblockcount", &[]).expect("failed to get block count");
 	let target_height = cur_height - num_blocks + 1;
 	let block_hash = bitcoind
 		.get_block_hash(target_height as u64)