Skip to content

Commit 84f1c66

Browse files
committed
f - drop invoice_received TLV
1 parent 99ce3f3 commit 84f1c66

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

lightning/src/events/mod.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,15 +1557,14 @@ impl Writeable for Event {
15571557
},
15581558
&Event::PaymentFailed { ref payment_id, ref payment_hash, ref reason } => {
15591559
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]),
15631563
};
15641564
write_tlv_fields!(writer, {
15651565
(0, payment_id, required),
15661566
(1, reason, option),
15671567
(2, payment_hash, required),
1568-
(3, invoice_received, required),
15691568
})
15701569
},
15711570
&Event::OpenChannelRequest { .. } => {
@@ -1939,13 +1938,12 @@ impl MaybeReadable for Event {
19391938
let mut payment_hash = PaymentHash([0; 32]);
19401939
let mut payment_id = PaymentId([0; 32]);
19411940
let mut reason = None;
1942-
let mut invoice_received = true;
19431941
read_tlv_fields!(reader, {
19441942
(0, payment_id, required),
19451943
(1, reason, upgradable_option),
19461944
(2, payment_hash, required),
1947-
(3, invoice_received, (default_value, true)),
19481945
});
1946+
let invoice_received = payment_hash != PaymentHash([0; 32]);
19491947
Ok(Some(Event::PaymentFailed {
19501948
payment_id,
19511949
payment_hash: invoice_received.then(|| payment_hash),

0 commit comments

Comments
 (0)