@@ -909,7 +909,7 @@ impl Writeable for Event {
909
909
( 2 , payment_failed_permanently, required) ,
910
910
( 3 , false , required) , // all_paths_failed in LDK versions prior to 0.0.114
911
911
( 4 , path. blinded_tail, option) ,
912
- ( 5 , path. hops, vec_type ) ,
912
+ ( 5 , path. hops, required_vec ) ,
913
913
( 7 , short_channel_id, option) ,
914
914
( 9 , None :: <RouteParameters >, option) , // retry in LDK versions prior to 0.0.115
915
915
( 11 , payment_id, option) ,
@@ -977,7 +977,7 @@ impl Writeable for Event {
977
977
write_tlv_fields ! ( writer, {
978
978
( 0 , payment_id, required) ,
979
979
( 2 , payment_hash, option) ,
980
- ( 4 , path. hops, vec_type ) ,
980
+ ( 4 , path. hops, required_vec ) ,
981
981
( 6 , path. blinded_tail, option) ,
982
982
} )
983
983
} ,
@@ -1008,7 +1008,7 @@ impl Writeable for Event {
1008
1008
write_tlv_fields ! ( writer, {
1009
1009
( 0 , payment_id, required) ,
1010
1010
( 2 , payment_hash, required) ,
1011
- ( 4 , path. hops, vec_type ) ,
1011
+ ( 4 , path. hops, required_vec ) ,
1012
1012
( 6 , path. blinded_tail, option) ,
1013
1013
} )
1014
1014
} ,
@@ -1017,7 +1017,7 @@ impl Writeable for Event {
1017
1017
write_tlv_fields ! ( writer, {
1018
1018
( 0 , payment_id, required) ,
1019
1019
( 2 , payment_hash, required) ,
1020
- ( 4 , path. hops, vec_type ) ,
1020
+ ( 4 , path. hops, required_vec ) ,
1021
1021
( 6 , short_channel_id, option) ,
1022
1022
( 8 , path. blinded_tail, option) ,
1023
1023
} )
@@ -1162,7 +1162,9 @@ impl MaybeReadable for Event {
1162
1162
( 1 , network_update, upgradable_option) ,
1163
1163
( 2 , payment_failed_permanently, required) ,
1164
1164
( 4 , blinded_tail, option) ,
1165
- ( 5 , path, vec_type) ,
1165
+ // Added as a part of LDK 0.0.101 and always filled in since.
1166
+ // Defaults to an empty Vec, though likely should have been `Option`al.
1167
+ ( 5 , path, optional_vec) ,
1166
1168
( 7 , short_channel_id, option) ,
1167
1169
( 11 , payment_id, option) ,
1168
1170
( 13 , failure_opt, upgradable_option) ,
@@ -1279,13 +1281,13 @@ impl MaybeReadable for Event {
1279
1281
_init_and_read_tlv_fields ! ( reader, {
1280
1282
( 0 , payment_id, required) ,
1281
1283
( 2 , payment_hash, option) ,
1282
- ( 4 , path, vec_type ) ,
1284
+ ( 4 , path, required_vec ) ,
1283
1285
( 6 , blinded_tail, option) ,
1284
1286
} ) ;
1285
1287
Ok ( Some ( Event :: PaymentPathSuccessful {
1286
1288
payment_id : payment_id. 0 . unwrap ( ) ,
1287
1289
payment_hash,
1288
- path : Path { hops : path. unwrap ( ) , blinded_tail } ,
1290
+ path : Path { hops : path, blinded_tail } ,
1289
1291
} ) )
1290
1292
} ;
1291
1293
f ( )
@@ -1338,13 +1340,13 @@ impl MaybeReadable for Event {
1338
1340
_init_and_read_tlv_fields ! ( reader, {
1339
1341
( 0 , payment_id, required) ,
1340
1342
( 2 , payment_hash, required) ,
1341
- ( 4 , path, vec_type ) ,
1343
+ ( 4 , path, required_vec ) ,
1342
1344
( 6 , blinded_tail, option) ,
1343
1345
} ) ;
1344
1346
Ok ( Some ( Event :: ProbeSuccessful {
1345
1347
payment_id : payment_id. 0 . unwrap ( ) ,
1346
1348
payment_hash : payment_hash. 0 . unwrap ( ) ,
1347
- path : Path { hops : path. unwrap ( ) , blinded_tail } ,
1349
+ path : Path { hops : path, blinded_tail } ,
1348
1350
} ) )
1349
1351
} ;
1350
1352
f ( )
@@ -1354,14 +1356,14 @@ impl MaybeReadable for Event {
1354
1356
_init_and_read_tlv_fields ! ( reader, {
1355
1357
( 0 , payment_id, required) ,
1356
1358
( 2 , payment_hash, required) ,
1357
- ( 4 , path, vec_type ) ,
1359
+ ( 4 , path, required_vec ) ,
1358
1360
( 6 , short_channel_id, option) ,
1359
1361
( 8 , blinded_tail, option) ,
1360
1362
} ) ;
1361
1363
Ok ( Some ( Event :: ProbeFailed {
1362
1364
payment_id : payment_id. 0 . unwrap ( ) ,
1363
1365
payment_hash : payment_hash. 0 . unwrap ( ) ,
1364
- path : Path { hops : path. unwrap ( ) , blinded_tail } ,
1366
+ path : Path { hops : path, blinded_tail } ,
1365
1367
short_channel_id,
1366
1368
} ) )
1367
1369
} ;
0 commit comments