f

Author: tnull

lightning-transaction-sync/tests/integration_tests.rs

@@ -47,14 +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");
+	let cur_height = bitcoind.client.get_block_count().expect("failed to get current block height").into_model().unwrap().0;
 	let address = bitcoind
 		.client
-		.get_new_address(Some("test"), Some(AddressType::Legacy))
-		.expect("failed to get new address")
-		.assume_checked();
+		.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 as u64, &address);
+	let _block_hashes_res = bitcoind.client.generate_to_address(num, &address);
 	wait_for_block(electrsd, cur_height as usize + num);
 }
 
@@ -177,9 +176,8 @@ macro_rules! test_syncing {
 		// Check registered confirmed transactions are marked confirmed
 		let new_address = $bitcoind
 			.client
-			.get_new_address(Some("test"), Some(AddressType::Legacy))
-			.unwrap()
-			.assume_checked();
+			.new_address()
+			.unwrap();
 		let txid = $bitcoind
 			.client
 			.send_to_address(&new_address, Amount::from_sat(5000))
@@ -212,16 +210,16 @@ macro_rules! test_syncing {
 		assert!($confirmable.unconfirmed_txs.lock().unwrap().is_empty());
 
 		// Now take an arbitrary output of the second transaction and check we'll confirm its spend.
-		let tx_res = $bitcoind.client.get_transaction(&second_txid, None).unwrap();
-		let block_hash = tx_res.info.blockhash.unwrap();
-		let tx = tx_res.transaction().unwrap();
+		let tx_res = $bitcoind.client.get_transaction(second_txid).unwrap().into_model().unwrap();
+		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, None)
+			.get_transaction(prev_outpoint.txid)
 			.unwrap()
-			.transaction()
-			.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),