Review findings, minor, renames, simplification

Author: optout21

lightning/src/chain/transaction.rs

@@ -11,6 +11,7 @@
 
 use crate::ln::channel::ChannelId;
 use bitcoin::hash_types::Txid;
+use bitcoin::hashes::Hash;
 use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
 use bitcoin::blockdata::transaction::Transaction;
 
@@ -57,9 +58,9 @@ pub struct OutPoint {
 }
 
 impl OutPoint {
-	/// Convert an `OutPoint` to a lightning channel id. Alternatively use ChannelId::from_funding_outpoint().
+	/// Convert an `OutPoint` to a lightning channel id.
 	pub fn to_channel_id(&self) -> ChannelId {
-		ChannelId::from_funding_outpoint(&self)
+		ChannelId::v1_from_funding_txid(&self.txid.as_inner(), self.index)
 	}
 
 	/// Converts this OutPoint into the OutPoint field as used by rust-bitcoin

lightning/src/ln/channel.rs

@@ -610,13 +610,8 @@ pub struct ChannelId {
 }
 
 impl ChannelId {
-	/// Create channel ID based on a funding TX outpoint
-	pub fn from_funding_outpoint(funding_tx_outpoint: &OutPoint) -> Self {
-		Self::from_funding_txid(&funding_tx_outpoint.txid.as_inner(), funding_tx_outpoint.index)
-	}
-
-	/// Create channel ID based on a funding TX ID and output index
-	pub fn from_funding_txid(txid: &[u8; 32], output_index: u16) -> Self {
+	/// Create v1 channel ID based on a funding TX ID and output index
+	pub fn v1_from_funding_txid(txid: &[u8; 32], output_index: u16) -> Self {
 		let mut res = [0; 32];
 		res[..].copy_from_slice(&txid[..]);
 		res[30] ^= ((output_index >> 8) & 0xff) as u8;
@@ -625,13 +620,13 @@ impl ChannelId {
 	}
 
 	/// Create a temporary channel ID randomly, based on an entropy source.
-	pub fn from_entropy_source<ES: Deref>(entropy_source: &ES) -> Self
+	pub fn temporary_from_entropy_source<ES: Deref>(entropy_source: &ES) -> Self
 	where ES::Target: EntropySource {
 		Self::from_bytes(entropy_source.get_secure_random_bytes())
 	}
 
 	/// Generic constructor; create a new channel ID from the provided data.
-	/// Use a more specific from_* constructor when possible.
+	/// Use a more specific *from_* constructor when possible.
 	/// This constructor is useful for tests, and internally, e.g. when the channel ID is being deserialized.
 	pub fn from_bytes(data: [u8; 32]) -> Self {
 		Self{data}
@@ -646,11 +641,6 @@ impl ChannelId {
 	pub fn bytes(&self) -> &[u8; 32] {
 		&self.data
 	}
-
-	/// Serialization helper
-	pub fn serialized_length(&self) -> usize {
-		self.bytes().serialized_length()
-	}
 }
 
 impl Writeable for ChannelId {
@@ -5676,7 +5666,7 @@ impl<Signer: WriteableEcdsaChannelSigner> OutboundV1Channel<Signer> {
 			Err(_) => return Err(APIError::ChannelUnavailable { err: "Failed to get destination script".to_owned()}),
 		};
 
-		let temporary_channel_id = ChannelId::from_entropy_source(entropy_source);
+		let temporary_channel_id = ChannelId::temporary_from_entropy_source(entropy_source);
 
 		Ok(Self {
 			context: ChannelContext {
@@ -7575,15 +7565,15 @@ mod tests {
 
 	#[test]
 	fn test_channel_id_from_funding_tx2() {
-		let channel_id = ChannelId::from_funding_txid(&[2; 32], 1);
+		let channel_id = ChannelId::v1_from_funding_txid(&[2; 32], 1);
 		assert_eq!(channel_id.to_hex(), "0202020202020202020202020202020202020202020202020202020202020203");
 	}
 
 	#[test]
 	fn test_channel_id_equals() {
-		let channel_id11 = ChannelId::from_funding_txid(&[2; 32], 2);
-		let channel_id12 = ChannelId::from_funding_txid(&[2; 32], 2);
-		let channel_id21 = ChannelId::from_funding_txid(&[2; 32], 42);
+		let channel_id11 = ChannelId::v1_from_funding_txid(&[2; 32], 2);
+		let channel_id12 = ChannelId::v1_from_funding_txid(&[2; 32], 2);
+		let channel_id21 = ChannelId::v1_from_funding_txid(&[2; 32], 42);
 		assert_eq!(channel_id11, channel_id12);
 		assert_ne!(channel_id11, channel_id21);
 	}

lightning/src/ln/channelmanager.rs

@@ -10526,7 +10526,7 @@ mod tests {
 
 		// If we provide a channel_id not associated with the peer, we should get an error and no updates
 		// should be applied to ensure update atomicity as specified in the API docs.
-		let bad_channel_id = ChannelId::from_funding_txid(&[10; 32], 10);
+		let bad_channel_id = ChannelId::v1_from_funding_txid(&[10; 32], 10);
 		let current_fee = nodes[0].node.list_channels()[0].config.unwrap().forwarding_fee_proportional_millionths;
 		let new_fee = current_fee + 100;
 		assert!(