X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Frouter.rs;h=4c00dc5fcf9327126d0f9bd580823fd1447ea4f7;hb=c5eab6e11f050c7f049b3bfaac35d35bcf5b751a;hp=1b14e9c735f145138ed2ad536f6fbf9e8674a9c0;hpb=5023ff05a86aa36ff809d176bdd285ee8c699682;p=rust-lightning

diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
index 1b14e9c7..4c00dc5f 100644
--- a/lightning/src/routing/router.rs
+++ b/lightning/src/routing/router.rs
@@ -1940,8 +1940,8 @@ mod tests {
 	use chain::transaction::OutPoint;
 	use chain::keysinterface::KeysInterface;
 	use ln::features::{ChannelFeatures, InitFeatures, InvoiceFeatures, NodeFeatures};
-	use ln::msgs::{ErrorAction, LightningError, OptionalField, UnsignedChannelAnnouncement, ChannelAnnouncement, RoutingMessageHandler,
-		NodeAnnouncement, UnsignedNodeAnnouncement, ChannelUpdate, UnsignedChannelUpdate};
+	use ln::msgs::{ErrorAction, LightningError, UnsignedChannelAnnouncement, ChannelAnnouncement, RoutingMessageHandler,
+		NodeAnnouncement, UnsignedNodeAnnouncement, ChannelUpdate, UnsignedChannelUpdate, MAX_VALUE_MSAT};
 	use ln::channelmanager;
 	use util::test_utils;
 	use util::chacha20::ChaCha20;
@@ -2133,7 +2133,7 @@ mod tests {
 				flags: 0,
 				cltv_expiry_delta: 0,
 				htlc_minimum_msat: 0,
-				htlc_maximum_msat: OptionalField::Absent,
+				htlc_maximum_msat: MAX_VALUE_MSAT,
 				fee_base_msat: 0,
 				fee_proportional_millionths: 0,
 				excess_data: Vec::new()
@@ -2145,7 +2145,7 @@ mod tests {
 				flags: 1,
 				cltv_expiry_delta: 0,
 				htlc_minimum_msat: 0,
-				htlc_maximum_msat: OptionalField::Absent,
+				htlc_maximum_msat: MAX_VALUE_MSAT,
 				fee_base_msat: 0,
 				fee_proportional_millionths: 0,
 				excess_data: Vec::new()
@@ -2239,7 +2239,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2255,7 +2255,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (5 << 4) | 3,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: u32::max_value(),
 			fee_proportional_millionths: u32::max_value(),
 			excess_data: Vec::new()
@@ -2267,7 +2267,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2283,7 +2283,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (5 << 4) | 3,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: u32::max_value(),
 			fee_proportional_millionths: u32::max_value(),
 			excess_data: Vec::new()
@@ -2295,7 +2295,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2311,7 +2311,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (3 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2323,7 +2323,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: (3 << 4) | 2,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 100,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2337,7 +2337,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (4 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 1000000,
 			excess_data: Vec::new()
@@ -2349,7 +2349,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: (4 << 4) | 2,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2363,7 +2363,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (13 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 2000000,
 			excess_data: Vec::new()
@@ -2375,7 +2375,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: (13 << 4) | 2,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2391,7 +2391,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (6 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2403,7 +2403,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: (6 << 4) | 2,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new(),
@@ -2417,7 +2417,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (11 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2429,7 +2429,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: (11 << 4) | 2,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2447,7 +2447,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (7 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 1000000,
 			excess_data: Vec::new()
@@ -2459,7 +2459,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: (7 << 4) | 2,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2544,7 +2544,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2556,7 +2556,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2568,7 +2568,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2580,7 +2580,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2592,7 +2592,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2607,7 +2607,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 200_000_000,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2622,7 +2622,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(199_999_999),
+			htlc_maximum_msat: 199_999_999,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2641,7 +2641,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2671,7 +2671,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 35_000,
-			htlc_maximum_msat: OptionalField::Present(40_000),
+			htlc_maximum_msat: 40_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2683,7 +2683,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 35_000,
-			htlc_maximum_msat: OptionalField::Present(40_000),
+			htlc_maximum_msat: 40_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2697,7 +2697,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2709,7 +2709,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2723,7 +2723,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2744,7 +2744,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 65_000,
-			htlc_maximum_msat: OptionalField::Present(80_000),
+			htlc_maximum_msat: 80_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2756,7 +2756,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2768,7 +2768,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 100_000,
 			excess_data: Vec::new()
@@ -2807,7 +2807,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -2819,7 +2819,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3225,7 +3225,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3237,7 +3237,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3297,7 +3297,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3309,7 +3309,7 @@ mod tests {
 			flags: 2, // to disable
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3642,7 +3642,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3654,7 +3654,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3669,7 +3669,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(1_000_000_000),
+			htlc_maximum_msat: 1_000_000_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3684,7 +3684,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: 250_000_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3717,7 +3717,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(1_000_000_000),
+			htlc_maximum_msat: 1_000_000_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3752,7 +3752,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(1_000_000_000),
+			htlc_maximum_msat: 1_000_000_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3767,7 +3767,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(15_000),
+			htlc_maximum_msat: 15_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3802,7 +3802,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3825,7 +3825,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (3 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: 15_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3837,7 +3837,7 @@ mod tests {
 			flags: 1,
 			cltv_expiry_delta: (3 << 4) | 2,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: 15_000,
 			fee_base_msat: 100,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3869,7 +3869,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(10_000),
+			htlc_maximum_msat: 10_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3917,7 +3917,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3929,7 +3929,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3944,7 +3944,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3956,7 +3956,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3969,7 +3969,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(50_000),
+			htlc_maximum_msat: 50_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -3981,7 +3981,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4038,7 +4038,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 1_000_000,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4050,7 +4050,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(50_000),
+			htlc_maximum_msat: 50_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4095,7 +4095,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4107,7 +4107,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(50_000),
+			htlc_maximum_msat: 50_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4122,7 +4122,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(60_000),
+			htlc_maximum_msat: 60_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4134,7 +4134,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(60_000),
+			htlc_maximum_msat: 60_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4149,7 +4149,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(200_000),
+			htlc_maximum_msat: 200_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4161,7 +4161,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(180_000),
+			htlc_maximum_msat: 180_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4252,7 +4252,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4264,7 +4264,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4278,7 +4278,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4290,7 +4290,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4305,7 +4305,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(200_000),
+			htlc_maximum_msat: 200_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4321,7 +4321,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(200_000),
+			htlc_maximum_msat: 200_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4333,7 +4333,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(200_000),
+			htlc_maximum_msat: 200_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4346,7 +4346,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4358,7 +4358,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4420,7 +4420,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4432,7 +4432,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4446,7 +4446,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4458,7 +4458,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4473,7 +4473,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(200_000),
+			htlc_maximum_msat: 200_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4489,7 +4489,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(200_000),
+			htlc_maximum_msat: 200_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4501,7 +4501,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(200_000),
+			htlc_maximum_msat: 200_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4514,7 +4514,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 1_000,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4526,7 +4526,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4587,7 +4587,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4600,7 +4600,7 @@ mod tests {
 			flags: 2,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4614,7 +4614,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4626,7 +4626,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4640,7 +4640,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4663,7 +4663,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(250_000),
+			htlc_maximum_msat: 250_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4675,7 +4675,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4688,7 +4688,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 150_000,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4700,7 +4700,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4771,7 +4771,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (5 << 4) | 5,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(99_000),
+			htlc_maximum_msat: 99_000,
 			fee_base_msat: u32::max_value(),
 			fee_proportional_millionths: u32::max_value(),
 			excess_data: Vec::new()
@@ -4783,7 +4783,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (5 << 4) | 3,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(99_000),
+			htlc_maximum_msat: 99_000,
 			fee_base_msat: u32::max_value(),
 			fee_proportional_millionths: u32::max_value(),
 			excess_data: Vec::new()
@@ -4795,7 +4795,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (4 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 1,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4807,7 +4807,7 @@ mod tests {
 			flags: 0|2, // Channel disabled
 			cltv_expiry_delta: (13 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 2000000,
 			excess_data: Vec::new()
@@ -4860,7 +4860,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(100_000),
+			htlc_maximum_msat: 100_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4872,7 +4872,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(50_000),
+			htlc_maximum_msat: 50_000,
 			fee_base_msat: 100,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4886,7 +4886,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(60_000),
+			htlc_maximum_msat: 60_000,
 			fee_base_msat: 100,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4898,7 +4898,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(60_000),
+			htlc_maximum_msat: 60_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4912,7 +4912,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(20_000),
+			htlc_maximum_msat: 20_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -4924,7 +4924,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(20_000),
+			htlc_maximum_msat: 20_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5011,7 +5011,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (6 << 4) | 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5026,7 +5026,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (5 << 4) | 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 100,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5041,7 +5041,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (4 << 4) | 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5056,7 +5056,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (3 << 4) | 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5071,7 +5071,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (2 << 4) | 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5085,7 +5085,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (1 << 4) | 0,
 			htlc_minimum_msat: 100,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5143,7 +5143,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(85_000),
+			htlc_maximum_msat: 85_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5156,7 +5156,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (4 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(270_000),
+			htlc_maximum_msat: 270_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 1000000,
 			excess_data: Vec::new()
@@ -5208,7 +5208,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: 0,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(80_000),
+			htlc_maximum_msat: 80_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5220,7 +5220,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (4 << 4) | 1,
 			htlc_minimum_msat: 90_000,
-			htlc_maximum_msat: OptionalField::Absent,
+			htlc_maximum_msat: MAX_VALUE_MSAT,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5741,7 +5741,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (4 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(250_000_000),
+			htlc_maximum_msat: 250_000_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()
@@ -5753,7 +5753,7 @@ mod tests {
 			flags: 0,
 			cltv_expiry_delta: (13 << 4) | 1,
 			htlc_minimum_msat: 0,
-			htlc_maximum_msat: OptionalField::Present(250_000_000),
+			htlc_maximum_msat: 250_000_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
 			excess_data: Vec::new()