X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fmsgs.rs;h=01a4378456498d7c20706784da60ea13790e3d26;hb=8e3744813a8730a0b4fa6219d314635167947f27;hp=004bd3d99d318e2458f41e9c31307614afb93b5f;hpb=5b28744755a4a5ef0303c9cbf927502495194055;p=rust-lightning

diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs
index 004bd3d9..01a43784 100644
--- a/lightning/src/ln/msgs.rs
+++ b/lightning/src/ln/msgs.rs
@@ -796,6 +796,9 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider + Send + Sync {
 	/// Handle an incoming channel_reestablish message from the given peer.
 	fn handle_channel_reestablish(&self, their_node_id: &PublicKey, msg: &ChannelReestablish);
 
+	/// Handle an incoming channel update from the given peer.
+	fn handle_channel_update(&self, their_node_id: &PublicKey, msg: &ChannelUpdate);
+
 	// Error:
 	/// Handle an incoming error message from the given peer.
 	fn handle_error(&self, their_node_id: &PublicKey, msg: &ErrorMessage);
@@ -1689,6 +1692,19 @@ impl Writeable for ReplyShortChannelIdsEnd {
 	}
 }
 
+impl QueryChannelRange {
+	/**
+	 * Calculates the overflow safe ending block height for the query.
+	 * Overflow returns `0xffffffff`, otherwise returns `first_blocknum + number_of_blocks`
+	 */
+	pub fn end_blocknum(&self) -> u32 {
+		match self.first_blocknum.checked_add(self.number_of_blocks) {
+			Some(block) => block,
+			None => u32::max_value(),
+		}
+	}
+}
+
 impl Readable for QueryChannelRange {
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		let chain_hash: BlockHash = Readable::read(r)?;
@@ -2530,6 +2546,24 @@ mod tests {
 		assert_eq!(msg.outgoing_cltv_value, 0xffffffff);
 	}
 
+	#[test]
+	fn query_channel_range_end_blocknum() {
+		let tests: Vec<(u32, u32, u32)> = vec![
+			(10000, 1500, 11500),
+			(0, 0xffffffff, 0xffffffff),
+			(1, 0xffffffff, 0xffffffff),
+		];
+
+		for (first_blocknum, number_of_blocks, expected) in tests.into_iter() {
+			let sut = msgs::QueryChannelRange {
+				chain_hash: BlockHash::from_hex("06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f").unwrap(),
+				first_blocknum,
+				number_of_blocks,
+			};
+			assert_eq!(sut.end_blocknum(), expected);
+		}
+	}
+
 	#[test]
 	fn encoding_query_channel_range() {
 		let mut query_channel_range = msgs::QueryChannelRange {