Rename TransactionData to TransactionDataRef

Author: jkczyz

lightning/src/chain/chainmonitor.rs

@@ -36,7 +36,7 @@ use chain::Filter;
 use chain::chaininterface::{BroadcasterInterface, FeeEstimator};
 use chain::channelmonitor;
 use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, MonitorEvent, Persist};
-use chain::transaction::{OutPoint, TransactionData};
+use chain::transaction::{OutPoint, TransactionDataRef};
 use chain::keysinterface::Sign;
 use util::logger::Logger;
 use util::events;
@@ -92,7 +92,7 @@ where C::Target: chain::Filter,
 	/// [`ChannelMonitor::block_connected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_connected
 	/// [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
 	/// [`chain::Filter`]: ../trait.Filter.html
-	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
+	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionDataRef, height: u32) {
 		let monitors = self.monitors.read().unwrap();
 		for monitor in monitors.values() {
 			let mut txn_outputs = monitor.block_connected(header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);

lightning/src/chain/channelmonitor.rs

@@ -43,7 +43,7 @@ use ln::channelmanager::{HTLCSource, PaymentPreimage, PaymentHash};
 use ln::onchaintx::{OnchainTxHandler, InputDescriptors};
 use chain;
 use chain::chaininterface::{BroadcasterInterface, FeeEstimator};
-use chain::transaction::{OutPoint, TransactionData};
+use chain::transaction::{OutPoint, TransactionDataRef};
 use chain::keysinterface::{SpendableOutputDescriptor, StaticPaymentOutputDescriptor, DelayedPaymentOutputDescriptor, Sign, KeysInterface};
 use chain::Filter;
 use util::logger::Logger;
@@ -1252,7 +1252,7 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 	pub fn block_connected<B: Deref, F: Deref, L: Deref>(
 		&self,
 		header: &BlockHeader,
-		txdata: &TransactionData,
+		txdata: &TransactionDataRef,
 		height: u32,
 		broadcaster: B,
 		fee_estimator: F,
@@ -1978,7 +1978,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 		return res
 	}
 
-	pub fn block_connected<B: Deref, F: Deref, L: Deref>(&mut self, header: &BlockHeader, txdata: &TransactionData, height: u32, broadcaster: B, fee_estimator: F, logger: L)-> Vec<(Txid, Vec<(u32, TxOut)>)>
+	pub fn block_connected<B: Deref, F: Deref, L: Deref>(&mut self, header: &BlockHeader, txdata: &TransactionDataRef, height: u32, broadcaster: B, fee_estimator: F, logger: L)-> Vec<(Txid, Vec<(u32, TxOut)>)>
 		where B::Target: BroadcasterInterface,
 		      F::Target: FeeEstimator,
 					L::Target: Logger,
@@ -2119,7 +2119,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 
 	/// Filters a block's `txdata` for transactions spending watched outputs or for any child
 	/// transactions thereof.
-	fn filter_block<'a>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
+	fn filter_block<'a>(&self, txdata: &TransactionDataRef<'a>) -> Vec<&'a Transaction> {
 		let mut matched_txn = HashSet::new();
 		txdata.iter().filter(|&&(_, tx)| {
 			let mut matches = self.spends_watched_output(tx);

lightning/src/chain/transaction.rs

@@ -26,13 +26,13 @@ use bitcoin::blockdata::transaction::Transaction;
 /// use bitcoin::blockdata::block::Block;
 /// use bitcoin::blockdata::constants::genesis_block;
 /// use bitcoin::network::constants::Network;
-/// use lightning::chain::transaction::TransactionData;
+/// use lightning::chain::transaction::TransactionDataRef;
 ///
 /// let block = genesis_block(Network::Bitcoin);
 /// let txdata: Vec<_> = block.txdata.iter().enumerate().collect();
 /// check_block(&block, &txdata);
 ///
-/// fn check_block(block: &Block, txdata: &TransactionData) {
+/// fn check_block(block: &Block, txdata: &TransactionDataRef) {
 /// 	assert_eq!(block.txdata.len(), 1);
 /// 	assert_eq!(txdata.len(), 1);
 ///
@@ -41,7 +41,7 @@ use bitcoin::blockdata::transaction::Transaction;
 /// 	assert_eq!(tx, &block.txdata[0]);
 /// }
 /// ```
-pub type TransactionData<'a> = [(usize, &'a Transaction)];
+pub type TransactionDataRef<'a> = [(usize, &'a Transaction)];
 
 /// A reference to a transaction output.
 ///

lightning/src/ln/channel.rs

@@ -30,7 +30,7 @@ use ln::chan_utils::{CounterpartyCommitmentSecrets, TxCreationKeys, HTLCOutputIn
 use ln::chan_utils;
 use chain::chaininterface::{FeeEstimator,ConfirmationTarget};
 use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, HTLC_FAIL_BACK_BUFFER};
-use chain::transaction::{OutPoint, TransactionData};
+use chain::transaction::{OutPoint, TransactionDataRef};
 use chain::keysinterface::{Sign, KeysInterface};
 use util::transaction_utils;
 use util::ser::{Readable, ReadableArgs, Writeable, Writer, VecWriter};
@@ -3498,7 +3498,7 @@ impl<Signer: Sign> Channel<Signer> {
 	///
 	/// May return some HTLCs (and their payment_hash) which have timed out and should be failed
 	/// back.
-	pub fn block_connected(&mut self, header: &BlockHeader, txdata: &TransactionData, height: u32) -> Result<(Option<msgs::FundingLocked>, Vec<(HTLCSource, PaymentHash)>), msgs::ErrorMessage> {
+	pub fn block_connected(&mut self, header: &BlockHeader, txdata: &TransactionDataRef, height: u32) -> Result<(Option<msgs::FundingLocked>, Vec<(HTLCSource, PaymentHash)>), msgs::ErrorMessage> {
 		let mut timed_out_htlcs = Vec::new();
 		self.holding_cell_htlc_updates.retain(|htlc_update| {
 			match htlc_update {

lightning/src/ln/channelmanager.rs

@@ -38,7 +38,7 @@ use chain;
 use chain::Watch;
 use chain::chaininterface::{BroadcasterInterface, FeeEstimator};
 use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, ChannelMonitorUpdateErr, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent, CLOSED_CHANNEL_UPDATE_ID};
-use chain::transaction::{OutPoint, TransactionData};
+use chain::transaction::{OutPoint, TransactionDataRef};
 use ln::channel::{Channel, ChannelError};
 use ln::features::{InitFeatures, NodeFeatures};
 use routing::router::{Route, RouteHop};
@@ -3253,7 +3253,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
         L::Target: Logger,
 {
 	/// Updates channel state based on transactions seen in a connected block.
-	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
+	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionDataRef, height: u32) {
 		// Note that we MUST NOT end up calling methods on self.chain_monitor here - we're called
 		// during initialization prior to the chain_monitor being fully configured in some cases.
 		// See the docs for `ChannelManagerReadArgs` for more.