X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Ftransaction.rs;h=17815207a8dcf92355dc762cdfd0e66afc0c33f5;hb=5bf58f0d33b13bd3d9f88c4f2021fbd77745274a;hp=39a0a5449ac7cf1a4f5dc636363b0ad9c0245c6f;hpb=1f1a8dd5c5f6c0dcc51f7e9e7645517f8f7ab354;p=rust-lightning

diff --git a/lightning/src/chain/transaction.rs b/lightning/src/chain/transaction.rs
index 39a0a544..17815207 100644
--- a/lightning/src/chain/transaction.rs
+++ b/lightning/src/chain/transaction.rs
@@ -9,9 +9,7 @@
 
 //! Types describing on-chain transactions.
 
-use crate::ln::ChannelId;
 use bitcoin::hash_types::Txid;
-use bitcoin::hashes::Hash;
 use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
 use bitcoin::blockdata::transaction::Transaction;
 
@@ -58,11 +56,6 @@ pub struct OutPoint {
 }
 
 impl OutPoint {
-	/// Convert an `OutPoint` to a lightning channel id.
-	pub fn to_channel_id(&self) -> ChannelId {
-		ChannelId::v1_from_funding_txid(&self.txid.as_inner(), self.index)
-	}
-
 	/// Converts this OutPoint into the OutPoint field as used by rust-bitcoin
 	///
 	/// This is not exported to bindings users as the same type is used universally in the C bindings 
@@ -86,22 +79,22 @@ impl_writeable!(OutPoint, { txid, index });
 #[cfg(test)]
 mod tests {
 	use crate::chain::transaction::OutPoint;
+	use crate::ln::ChannelId;
 
 	use bitcoin::blockdata::transaction::Transaction;
 	use bitcoin::consensus::encode;
-
-	use hex;
+	use bitcoin::hashes::hex::FromHex;
 
 	#[test]
 	fn test_channel_id_calculation() {
-		let tx: Transaction = encode::deserialize(&hex::decode("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
-		assert_eq!(&OutPoint {
+		let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
+		assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 			txid: tx.txid(),
 			index: 0
-		}.to_channel_id().0[..], &hex::decode("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
-		assert_eq!(&OutPoint {
+		}).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
+		assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 			txid: tx.txid(),
 			index: 1
-		}.to_channel_id().0[..], &hex::decode("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
+		}).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
 	}
 }