Fix deprecated method calls.

Author: arik-so

lightning-background-processor/src/lib.rs

@@ -1866,7 +1866,10 @@ mod tests {
 		nodes[0]
 			.node
 			.force_close_broadcasting_latest_txn(
-				&ChannelId::v1_from_funding_outpoint(OutPoint { txid: tx.txid(), index: 0 }),
+				&ChannelId::v1_from_funding_outpoint(OutPoint {
+					txid: tx.compute_txid(),
+					index: 0,
+				}),
 				&nodes[1].node.get_our_node_id(),
 				error_message.to_string(),
 			)
@@ -2134,7 +2137,7 @@ mod tests {
 			get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, node_0_id);
 		let broadcast_funding =
 			nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
-		assert_eq!(broadcast_funding.txid(), funding_tx.txid());
+		assert_eq!(broadcast_funding.compute_txid(), funding_tx.compute_txid());
 		assert!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().is_empty());
 
 		if !std::thread::panicking() {
@@ -2212,7 +2215,7 @@ mod tests {
 		let sweep_tx_0 = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
 		match tracked_output.status {
 			OutputSpendStatus::PendingFirstConfirmation { latest_spending_tx, .. } => {
-				assert_eq!(sweep_tx_0.txid(), latest_spending_tx.txid());
+				assert_eq!(sweep_tx_0.compute_txid(), latest_spending_tx.compute_txid());
 			},
 			_ => panic!("Unexpected status"),
 		}
@@ -2224,7 +2227,7 @@ mod tests {
 		let sweep_tx_1 = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
 		match tracked_output.status {
 			OutputSpendStatus::PendingFirstConfirmation { latest_spending_tx, .. } => {
-				assert_eq!(sweep_tx_1.txid(), latest_spending_tx.txid());
+				assert_eq!(sweep_tx_1.compute_txid(), latest_spending_tx.compute_txid());
 			},
 			_ => panic!("Unexpected status"),
 		}
@@ -2236,7 +2239,7 @@ mod tests {
 		let sweep_tx_2 = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
 		match tracked_output.status {
 			OutputSpendStatus::PendingFirstConfirmation { latest_spending_tx, .. } => {
-				assert_eq!(sweep_tx_2.txid(), latest_spending_tx.txid());
+				assert_eq!(sweep_tx_2.compute_txid(), latest_spending_tx.compute_txid());
 			},
 			_ => panic!("Unexpected status"),
 		}
@@ -2249,7 +2252,7 @@ mod tests {
 		let tracked_output = nodes[0].sweeper.tracked_spendable_outputs().first().unwrap().clone();
 		match tracked_output.status {
 			OutputSpendStatus::PendingThresholdConfirmations { latest_spending_tx, .. } => {
-				assert_eq!(sweep_tx_2.txid(), latest_spending_tx.txid());
+				assert_eq!(sweep_tx_2.compute_txid(), latest_spending_tx.compute_txid());
 			},
 			_ => panic!("Unexpected status"),
 		}
@@ -2264,7 +2267,7 @@ mod tests {
 		let tracked_output = nodes[0].sweeper.tracked_spendable_outputs().first().unwrap().clone();
 		match tracked_output.status {
 			OutputSpendStatus::PendingThresholdConfirmations { latest_spending_tx, .. } => {
-				assert_eq!(sweep_tx_2.txid(), latest_spending_tx.txid());
+				assert_eq!(sweep_tx_2.compute_txid(), latest_spending_tx.compute_txid());
 			},
 			_ => panic!("Unexpected status"),
 		}

lightning-block-sync/src/gossip.rs

@@ -198,7 +198,7 @@ where
 						return Err(UtxoLookupError::UnknownTx);
 					}
 
-					outpoint = OutPoint::new(transaction.txid(), output_index.into());
+					outpoint = OutPoint::new(transaction.compute_txid(), output_index.into());
 					output = transaction.output[output_index as usize].clone();
 				}};
 			}

lightning-block-sync/src/poll.rs

@@ -144,7 +144,7 @@ impl ValidatedBlockHeader {
 			if self.height % 2016 == 0 {
 				let target = self.header.target();
 				let previous_target = previous_header.header.target();
-				let min_target = previous_target.min_difficulty_transition_threshold();
+				let min_target = previous_target.min_transition_threshold();
 				let max_target = previous_target.max_difficulty_transition_threshold();
 				if target > max_target || target < min_target {
 					return Err(BlockSourceError::persistent("invalid difficulty transition"));

lightning-block-sync/src/test_utils.rs

@@ -53,7 +53,7 @@ impl Blockchain {
 				input: vec![],
 				output: vec![],
 			};
-			let merkle_root = TxMerkleNode::from_raw_hash(coinbase.txid().to_raw_hash());
+			let merkle_root = TxMerkleNode::from_raw_hash(coinbase.compute_txid().to_raw_hash());
 			self.blocks.push(Block {
 				header: Header {
 					version: Version::NO_SOFT_FORK_SIGNALLING,

lightning/src/blinded_path/mod.rs

@@ -275,12 +275,11 @@ impl Writeable for BlindedPath {
 
 impl Readable for BlindedPath {
 	fn read<R: io::Read>(r: &mut R) -> Result<Self, DecodeError> {
-		let mut first_byte: u8 = Readable::read(r)?;
+		let first_byte: u8 = Readable::read(r)?;
 		let introduction_node = match first_byte {
 			0 => IntroductionNode::DirectedShortChannelId(Direction::NodeOne, Readable::read(r)?),
 			1 => IntroductionNode::DirectedShortChannelId(Direction::NodeTwo, Readable::read(r)?),
 			2|3 => {
-				use io::Read;
 				let mut bytes = [0; 33];
 				bytes[0] = first_byte;
 				r.read_exact(&mut bytes[1..])?;

lightning/src/chain/channelmonitor.rs

@@ -2143,7 +2143,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 				} = &event.event {
 					if event.transaction.as_ref().map(|tx| tx.input.iter().any(|inp| {
 						if let Some(htlc_spend_txid) = htlc_spend_txid_opt {
-							tx.txid() == *htlc_spend_txid || inp.previous_output.txid == *htlc_spend_txid
+							tx.compute_txid() == *htlc_spend_txid || inp.previous_output.txid == *htlc_spend_txid
 						} else {
 							Some(inp.previous_output.txid) == confirmed_txid &&
 								inp.previous_output.vout == htlc_commitment_tx_output_idx
@@ -2592,7 +2592,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 macro_rules! fail_unbroadcast_htlcs {
 	($self: expr, $commitment_tx_type: expr, $commitment_txid_confirmed: expr, $commitment_tx_confirmed: expr,
 	 $commitment_tx_conf_height: expr, $commitment_tx_conf_hash: expr, $confirmed_htlcs_list: expr, $logger: expr) => { {
-		debug_assert_eq!($commitment_tx_confirmed.txid(), $commitment_txid_confirmed);
+		debug_assert_eq!($commitment_tx_confirmed.compute_txid(), $commitment_txid_confirmed);
 
 		macro_rules! check_htlc_fails {
 			($txid: expr, $commitment_tx: expr, $per_commitment_outpoints: expr) => {
@@ -3225,7 +3225,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 					// introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 					// since v0.0.110.
 					let counterparty_node_id = self.counterparty_node_id.unwrap();
-					let commitment_txid = commitment_tx.txid();
+					let commitment_txid = commitment_tx.compute_txid();
 					debug_assert_eq!(self.current_holder_commitment_tx.txid, commitment_txid);
 					let pending_htlcs = self.current_holder_commitment_tx.non_dust_htlcs();
 					let commitment_tx_fee_satoshis = self.channel_value_satoshis -
@@ -3405,7 +3405,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		let mut claimable_outpoints = Vec::new();
 		let mut to_counterparty_output_info = None;
 
-		let commitment_txid = tx.txid(); //TODO: This is gonna be a performance bottleneck for watchtowers!
+		let commitment_txid = tx.compute_txid(); //TODO: This is gonna be a performance bottleneck for watchtowers!
 		let per_commitment_option = self.counterparty_claimable_outpoints.get(&commitment_txid);
 
 		macro_rules! ignore_error {
@@ -3591,7 +3591,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		};
 		let per_commitment_point = PublicKey::from_secret_key(&self.onchain_tx_handler.secp_ctx, &per_commitment_key);
 
-		let htlc_txid = tx.txid();
+		let htlc_txid = tx.compute_txid();
 		let mut claimable_outpoints = vec![];
 		let mut outputs_to_watch = None;
 		// Previously, we would only claim HTLCs from revoked HTLC transactions if they had 1 input
@@ -3683,7 +3683,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 	/// Should not be used if check_spend_revoked_transaction succeeds.
 	/// Returns None unless the transaction is definitely one of our commitment transactions.
 	fn check_spend_holder_transaction<L: Deref>(&mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &L) -> Option<(Vec<PackageTemplate>, TransactionOutputs)> where L::Target: Logger {
-		let commitment_txid = tx.txid();
+		let commitment_txid = tx.compute_txid();
 		let mut claim_requests = Vec::new();
 		let mut watch_outputs = Vec::new();
 
@@ -3788,7 +3788,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 	) -> Vec<Transaction> where L::Target: Logger {
 		log_debug!(logger, "Getting signed copy of latest holder commitment transaction!");
 		let commitment_tx = self.onchain_tx_handler.get_fully_signed_copy_holder_tx(&self.funding_redeemscript);
-		let txid = commitment_tx.txid();
+		let txid = commitment_tx.compute_txid();
 		let mut holder_transactions = vec![commitment_tx];
 		// When anchor outputs are present, the HTLC transactions are only final once the commitment
 		// transaction confirms due to the CSV 1 encumberance.
@@ -3887,7 +3887,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		let mut watch_outputs = Vec::new();
 		let mut claimable_outpoints = Vec::new();
 		'tx_iter: for tx in &txn_matched {
-			let txid = tx.txid();
+			let txid = tx.compute_txid();
 			log_trace!(logger, "Transaction {} confirmed in block {}", txid , block_hash);
 			// If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
 			if Some(txid) == self.funding_spend_confirmed {
@@ -4133,7 +4133,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 			// make sure the registered scriptpubkey at the expected index match
 			// the actual transaction output one. We failed this case before #653.
 			for tx in &txn_matched {
-				if let Some(outputs) = self.get_outputs_to_watch().get(&tx.txid()) {
+				if let Some(outputs) = self.get_outputs_to_watch().get(&tx.compute_txid()) {
 					for idx_and_script in outputs.iter() {
 						assert!((idx_and_script.0 as usize) < tx.output.len());
 						assert_eq!(tx.output[idx_and_script.0 as usize].script_pubkey, idx_and_script.1);
@@ -4208,7 +4208,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 				}
 			}
 			if matches {
-				matched_txn.insert(tx.txid());
+				matched_txn.insert(tx.compute_txid());
 			}
 			matches
 		}).map(|(_, tx)| *tx).collect()
@@ -4362,12 +4362,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 					if ($holder_tx && revocation_sig_claim) ||
 							(outbound_htlc && !$source_avail && (accepted_preimage_claim || offered_preimage_claim)) {
 						log_error!(logger, "Input spending {} ({}:{}) in {} resolves {} HTLC with payment hash {} with {}!",
-							$tx_info, input.previous_output.txid, input.previous_output.vout, tx.txid(),
+							$tx_info, input.previous_output.txid, input.previous_output.vout, tx.compute_txid(),
 							if outbound_htlc { "outbound" } else { "inbound" }, &$htlc.payment_hash,
 							if revocation_sig_claim { "revocation sig" } else { "preimage claim after we'd passed the HTLC resolution back. We can likely claim the HTLC output with a revocation claim" });
 					} else {
 						log_info!(logger, "Input spending {} ({}:{}) in {} resolves {} HTLC with payment hash {} with {}",
-							$tx_info, input.previous_output.txid, input.previous_output.vout, tx.txid(),
+							$tx_info, input.previous_output.txid, input.previous_output.vout, tx.compute_txid(),
 							if outbound_htlc { "outbound" } else { "inbound" }, &$htlc.payment_hash,
 							if revocation_sig_claim { "revocation sig" } else if accepted_preimage_claim || offered_preimage_claim { "preimage" } else { "timeout" });
 					}
@@ -4414,7 +4414,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 								log_claim!($tx_info, $holder_tx, htlc_output, false);
 								let outbound_htlc = $holder_tx == htlc_output.offered;
 								self.onchain_events_awaiting_threshold_conf.push(OnchainEventEntry {
-									txid: tx.txid(), height, block_hash: Some(*block_hash), transaction: Some(tx.clone()),
+									txid: tx.compute_txid(), height, block_hash: Some(*block_hash), transaction: Some(tx.clone()),
 									event: OnchainEvent::HTLCSpendConfirmation {
 										commitment_tx_output_idx: input.previous_output.vout,
 										preimage: if accepted_preimage_claim || offered_preimage_claim {
@@ -4456,7 +4456,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 					if !self.pending_monitor_events.iter().any(
 						|update| if let &MonitorEvent::HTLCEvent(ref upd) = update { upd.source == source } else { false }) {
 						self.onchain_events_awaiting_threshold_conf.push(OnchainEventEntry {
-							txid: tx.txid(),
+							txid: tx.compute_txid(),
 							height,
 							block_hash: Some(*block_hash),
 							transaction: Some(tx.clone()),
@@ -4479,7 +4479,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 							upd.source == source
 						} else { false }) {
 						self.onchain_events_awaiting_threshold_conf.push(OnchainEventEntry {
-							txid: tx.txid(),
+							txid: tx.compute_txid(),
 							transaction: Some(tx.clone()),
 							height,
 							block_hash: Some(*block_hash),
@@ -4507,7 +4507,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						}
 					});
 					let entry = OnchainEventEntry {
-						txid: tx.txid(),
+						txid: tx.compute_txid(),
 						transaction: Some(tx.clone()),
 						height,
 						block_hash: Some(*block_hash),
@@ -4529,15 +4529,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		for (i, outp) in tx.output.iter().enumerate() {
 			if outp.script_pubkey == self.destination_script {
 				spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
-					outpoint: OutPoint { txid: tx.txid(), index: i as u16 },
+					outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 					output: outp.clone(),
 					channel_keys_id: Some(self.channel_keys_id),
 				});
 			}
 			if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
 				if broadcasted_holder_revokable_script.0 == outp.script_pubkey {
 					spendable_outputs.push(SpendableOutputDescriptor::DelayedPaymentOutput(DelayedPaymentOutputDescriptor {
-						outpoint: OutPoint { txid: tx.txid(), index: i as u16 },
+						outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 						per_commitment_point: broadcasted_holder_revokable_script.1,
 						to_self_delay: self.on_holder_tx_csv,
 						output: outp.clone(),
@@ -4550,7 +4550,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 			}
 			if self.counterparty_payment_script == outp.script_pubkey {
 				spendable_outputs.push(SpendableOutputDescriptor::StaticPaymentOutput(StaticPaymentOutputDescriptor {
-					outpoint: OutPoint { txid: tx.txid(), index: i as u16 },
+					outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 					output: outp.clone(),
 					channel_keys_id: self.channel_keys_id,
 					channel_value_satoshis: self.channel_value_satoshis,
@@ -4559,7 +4559,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 			}
 			if self.shutdown_script.as_ref() == Some(&outp.script_pubkey) {
 				spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
-					outpoint: OutPoint { txid: tx.txid(), index: i as u16 },
+					outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 					output: outp.clone(),
 					channel_keys_id: Some(self.channel_keys_id),
 				});
@@ -4575,7 +4575,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 	) where L::Target: Logger {
 		for spendable_output in self.get_spendable_outputs(tx) {
 			let entry = OnchainEventEntry {
-				txid: tx.txid(),
+				txid: tx.compute_txid(),
 				transaction: Some(tx.clone()),
 				height,
 				block_hash: Some(*block_hash),
@@ -5068,7 +5068,7 @@ mod tests {
 		assert!(txn_broadcasted.len() >= 2);
 		let htlc_txn = txn_broadcasted.iter().filter(|tx| {
 			assert_eq!(tx.input.len(), 1);
-			tx.input[0].previous_output.txid == broadcast_tx.txid()
+			tx.input[0].previous_output.txid == broadcast_tx.compute_txid()
 		}).collect::<Vec<_>>();
 		assert_eq!(htlc_txn.len(), 2);
 		check_spends!(htlc_txn[0], broadcast_tx);