f - fix tests

Author: jkczyz

lightning/src/events/bump_transaction/mod.rs

@@ -50,7 +50,7 @@ use bitcoin::secp256k1::ecdsa::Signature;
 use bitcoin::secp256k1::{PublicKey, Secp256k1};
 use bitcoin::transaction::Version;
 use bitcoin::{
-	FeeRate, OutPoint, Psbt, PubkeyHash, ScriptBuf, Sequence, Transaction, TxIn, TxOut, WPubkeyHash, Witness,
+	OutPoint, Psbt, PubkeyHash, ScriptBuf, Sequence, Transaction, TxIn, TxOut, WPubkeyHash, Witness,
 };
 
 /// A descriptor used to sign for a commitment transaction's anchor output.

lightning/src/events/bump_transaction/sync.rs

@@ -15,13 +15,12 @@ use core::task;
 
 use crate::chain::chaininterface::BroadcasterInterface;
 use crate::chain::ClaimId;
-use crate::ln::funding::FundingTxInput;
 use crate::prelude::*;
 use crate::sign::SignerProvider;
 use crate::util::async_poll::{dummy_waker, AsyncResult, MaybeSend, MaybeSync};
 use crate::util::logger::Logger;
 
-use bitcoin::{FeeRate, Psbt, ScriptBuf, Transaction, TxOut};
+use bitcoin::{Psbt, ScriptBuf, Transaction, TxOut};
 
 use super::BumpTransactionEvent;
 use super::{

lightning/src/ln/channel.rs

@@ -15758,7 +15758,6 @@ mod tests {
 	};
 	use crate::ln::channel_keys::{RevocationBasepoint, RevocationKey};
 	use crate::ln::channelmanager::{self, HTLCSource, PaymentId};
-	use crate::ln::funding::FundingTxInput;
 	use crate::ln::msgs;
 	use crate::ln::msgs::{ChannelUpdate, UnsignedChannelUpdate, MAX_VALUE_MSAT};
 	use crate::ln::onion_utils::{AttributionData, LocalHTLCFailureReason};
@@ -15790,7 +15789,7 @@ mod tests {
 	use bitcoin::secp256k1::{ecdsa::Signature, Secp256k1};
 	use bitcoin::secp256k1::{PublicKey, SecretKey};
 	use bitcoin::transaction::{Transaction, TxOut, Version};
-	use bitcoin::{ScriptBuf, WPubkeyHash, WitnessProgram, WitnessVersion};
+	use bitcoin::{WitnessProgram, WitnessVersion};
 	use std::cmp;
 
 	#[test]

lightning/src/ln/functional_test_utils.rs

@@ -612,6 +612,10 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 		self.blocks.lock().unwrap()[height as usize].0.header
 	}
 
+	pub fn provide_funding_utxos(&self, utxos: usize, amount: Amount) -> Transaction {
+		provide_anchor_utxo_reserves(core::slice::from_ref(self), utxos, amount)
+	}
+
 	/// Executes `enable_channel_signer_op` for every single signer operation for this channel.
 	#[cfg(test)]
 	pub fn enable_all_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId) {