X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fchain%2Ftransaction.rs;h=42a4f952e4150550f240c9c59d5d89a9a885c7de;hb=b02176c86bfa991a7c4856e427355d6e034e1eaa;hp=dad3c1271e4f0e5459691d44ddd092b101e6299c;hpb=5918df84909109e965fe1784434227c06d93c249;p=rust-lightning

diff --git a/src/chain/transaction.rs b/src/chain/transaction.rs
index dad3c127..42a4f952 100644
--- a/src/chain/transaction.rs
+++ b/src/chain/transaction.rs
@@ -20,7 +20,9 @@ impl OutPoint {
 
 	/// Convert an `OutPoint` to a lightning channel id.
 	pub fn to_channel_id(&self) -> Uint256 {
-		// TODO: or le?
-		self.txid.into_be() ^ Uint256::from_u64(self.index as u64).unwrap()
+		let mut index = [0; 32];
+		index[30] = ((self.index >> 8) & 0xff) as u8;
+		index[31] = ((self.index >> 0) & 0xff) as u8;
+		self.txid.into_le() ^ Sha256dHash::from(&index[..]).into_le()
 	}
 }