f note that u16 <= 0xffff is trivial

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -3339,11 +3339,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 							channel_id: self.channel_id(),
 							data: "funding tx had wrong script/value".to_owned()
 						});
-					} else if txo_idx > 0xff_ff {
-						return Err(msgs::ErrorMessage {
-							channel_id: self.channel_id(),
-							data: "funding tx output was > 2**16 which makes short_channel_id impossible to calculate".to_owned()
-						});
 					} else {
 						if self.channel_outbound {
 							for input in tx.input.iter() {
@@ -3358,6 +3353,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 						if height > 0xff_ff_ff || (*index_in_block) > 0xff_ff_ff {
 							panic!("Block was bogus - either height 16 million or had > 16 million transactions");
 						}
+						assert!(txo_idx <= 0xffff); // txo_idx is a (u16 as usize), so this is just listed here for completeness
 						self.funding_tx_confirmations = 1;
 						self.short_channel_id = Some(((height as u64)          << (5*8)) |
 						                             ((*index_in_block as u64) << (2*8)) |