projects
/
rust-lightning
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a356ca
202acd9
)
Merge pull request #1077 from jkczyz/2021-09-failing-route-hop
author
Matt Corallo
<649246+TheBlueMatt@users.noreply.github.com>
Wed, 13 Oct 2021 01:13:41 +0000
(
01:13
+0000)
committer
GitHub
<noreply@github.com>
Wed, 13 Oct 2021 01:13:41 +0000
(
01:13
+0000)
Include short channel id in PaymentPathFailed
1
2
lightning/src/ln/channelmanager.rs
patch
|
diff1
|
diff2
|
blob
|
history
lightning/src/ln/functional_tests.rs
patch
|
diff1
|
diff2
|
blob
|
history
lightning/src/routing/network_graph.rs
patch
|
diff1
|
diff2
|
blob
|
history
lightning/src/util/events.rs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lightning/src/ln/channelmanager.rs
index 4a3c69f9995f882ecf5933117a79720f7cc81561,e2584c4716a3528491b9df3f5586c3770674debe..298f88ce0cc018162cf5f2a3201512641b1cd8fd
---
1
/
lightning/src/ln/channelmanager.rs
---
2
/
lightning/src/ln/channelmanager.rs
+++ b/
lightning/src/ln/channelmanager.rs
@@@
-3014,8
-2886,9
+3014,9
@@@
impl<Signer: Sign, M: Deref, T: Deref,
payment_hash,
rejected_by_dest: false,
network_update: None,
- all_paths_failed:
sessions.get().len
() == 0,
+ all_paths_failed:
payment.get().remaining_parts
() == 0,
path: path.clone(),
+ short_channel_id: None,
#[cfg(test)]
error_code: None,
#[cfg(test)]
diff --cc
lightning/src/ln/functional_tests.rs
Simple merge
diff --cc
lightning/src/routing/network_graph.rs
Simple merge
diff --cc
lightning/src/util/events.rs
Simple merge