X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_utils.rs;h=1c1105cfcae76dcc0634ad531d2aa73ffb012365;hb=36c725fe1c86fba9a43b70a0fdb2d36767fe29bd;hp=98f4b64496eadbdbab31efb2e6cfa5f9ad734f52;hpb=87a0018e3ebf7d47086032d817a9e671c359214e;p=rust-lightning

diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
index 98f4b6449..1c1105cfc 100644
--- a/lightning/src/ln/onion_utils.rs
+++ b/lightning/src/ln/onion_utils.rs
@@ -121,12 +121,10 @@ pub(super) fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) ->
 		let value_msat = if cur_value_msat == 0 { hop.fee_msat } else { cur_value_msat };
 		let cltv = if cur_cltv == starting_htlc_offset { hop.cltv_expiry_delta + starting_htlc_offset } else { cur_cltv };
 		res.insert(0, msgs::OnionHopData {
-			realm: 0,
-			data: msgs::OnionRealm0HopData {
-				short_channel_id: last_short_channel_id,
-				amt_to_forward: value_msat,
-				outgoing_cltv_value: cltv,
-			},
+			format: msgs::OnionHopDataFormat::Legacy,
+			short_channel_id: last_short_channel_id,
+			amt_to_forward: value_msat,
+			outgoing_cltv_value: cltv,
 			hmac: [0; 32],
 		});
 		cur_value_msat += hop.fee_msat;
@@ -516,48 +514,38 @@ mod tests {
 		// Test vectors below are flat-out wrong: they claim to set outgoing_cltv_value to non-0 :/
 		let payloads = vec!(
 			msgs::OnionHopData {
-				realm: 0,
-				data: msgs::OnionRealm0HopData {
-					short_channel_id: 0,
-					amt_to_forward: 0,
-					outgoing_cltv_value: 0,
-				},
+				format: msgs::OnionHopDataFormat::Legacy,
+				short_channel_id: 0,
+				amt_to_forward: 0,
+				outgoing_cltv_value: 0,
 				hmac: [0; 32],
 			},
 			msgs::OnionHopData {
-				realm: 0,
-				data: msgs::OnionRealm0HopData {
-					short_channel_id: 0x0101010101010101,
-					amt_to_forward: 0x0100000001,
-					outgoing_cltv_value: 0,
-				},
+				format: msgs::OnionHopDataFormat::Legacy,
+				short_channel_id: 0x0101010101010101,
+				amt_to_forward: 0x0100000001,
+				outgoing_cltv_value: 0,
 				hmac: [0; 32],
 			},
 			msgs::OnionHopData {
-				realm: 0,
-				data: msgs::OnionRealm0HopData {
-					short_channel_id: 0x0202020202020202,
-					amt_to_forward: 0x0200000002,
-					outgoing_cltv_value: 0,
-				},
+				format: msgs::OnionHopDataFormat::Legacy,
+				short_channel_id: 0x0202020202020202,
+				amt_to_forward: 0x0200000002,
+				outgoing_cltv_value: 0,
 				hmac: [0; 32],
 			},
 			msgs::OnionHopData {
-				realm: 0,
-				data: msgs::OnionRealm0HopData {
-					short_channel_id: 0x0303030303030303,
-					amt_to_forward: 0x0300000003,
-					outgoing_cltv_value: 0,
-				},
+				format: msgs::OnionHopDataFormat::Legacy,
+				short_channel_id: 0x0303030303030303,
+				amt_to_forward: 0x0300000003,
+				outgoing_cltv_value: 0,
 				hmac: [0; 32],
 			},
 			msgs::OnionHopData {
-				realm: 0,
-				data: msgs::OnionRealm0HopData {
-					short_channel_id: 0x0404040404040404,
-					amt_to_forward: 0x0400000004,
-					outgoing_cltv_value: 0,
-				},
+				format: msgs::OnionHopDataFormat::Legacy,
+				short_channel_id: 0x0404040404040404,
+				amt_to_forward: 0x0400000004,
+				outgoing_cltv_value: 0,
 				hmac: [0; 32],
 			},
 		);