@@ -1557,15 +1557,14 @@ impl Writeable for Event {
1557
1557
} ,
1558
1558
& Event :: PaymentFailed { ref payment_id, ref payment_hash, ref reason } => {
1559
1559
15u8 . write ( writer) ?;
1560
- let ( payment_hash, invoice_received ) = match payment_hash {
1561
- Some ( payment_hash) => ( payment_hash, true ) ,
1562
- None => ( & PaymentHash ( [ 0 ; 32 ] ) , false ) ,
1560
+ let payment_hash = match payment_hash {
1561
+ Some ( payment_hash) => payment_hash,
1562
+ None => & PaymentHash ( [ 0 ; 32 ] ) ,
1563
1563
} ;
1564
1564
write_tlv_fields ! ( writer, {
1565
1565
( 0 , payment_id, required) ,
1566
1566
( 1 , reason, option) ,
1567
1567
( 2 , payment_hash, required) ,
1568
- ( 3 , invoice_received, required) ,
1569
1568
} )
1570
1569
} ,
1571
1570
& Event :: OpenChannelRequest { .. } => {
@@ -1939,13 +1938,12 @@ impl MaybeReadable for Event {
1939
1938
let mut payment_hash = PaymentHash ( [ 0 ; 32 ] ) ;
1940
1939
let mut payment_id = PaymentId ( [ 0 ; 32 ] ) ;
1941
1940
let mut reason = None ;
1942
- let mut invoice_received = true ;
1943
1941
read_tlv_fields ! ( reader, {
1944
1942
( 0 , payment_id, required) ,
1945
1943
( 1 , reason, upgradable_option) ,
1946
1944
( 2 , payment_hash, required) ,
1947
- ( 3 , invoice_received, ( default_value, true ) ) ,
1948
1945
} ) ;
1946
+ let invoice_received = payment_hash != PaymentHash ( [ 0 ; 32 ] ) ;
1949
1947
Ok ( Some ( Event :: PaymentFailed {
1950
1948
payment_id,
1951
1949
payment_hash : invoice_received. then ( || payment_hash) ,
0 commit comments