From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Wed, 13 Oct 2021 01:13:41 +0000 (+0000)
Subject: Merge pull request #1077 from jkczyz/2021-09-failing-route-hop
X-Git-Tag: v0.0.102~7
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=fe8c10db95124e3238b7469bdabb00afc7c5bdd6;p=rust-lightning

Merge pull request #1077 from jkczyz/2021-09-failing-route-hop

Include short channel id in PaymentPathFailed
---

fe8c10db95124e3238b7469bdabb00afc7c5bdd6
diff --cc lightning/src/ln/channelmanager.rs
index 4a3c69f99,e2584c471..298f88ce0
--- a/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)]