projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1500 from arik-so/2022-05-network-graph-rapid-sync-timestamp
[rust-lightning]
/
lightning
/
src
/
routing
/
router.rs
diff --git
a/lightning/src/routing/router.rs
b/lightning/src/routing/router.rs
index 5bb81a033eb697193cde37776c8f9a9dadde04c8..8731e66da9bd866bd82d00bc42c8922cd25508e8 100644
(file)
--- a/
lightning/src/routing/router.rs
+++ b/
lightning/src/routing/router.rs
@@
-383,7
+383,7
@@
enum CandidateRouteHop<'a> {
impl<'a> CandidateRouteHop<'a> {
fn short_channel_id(&self) -> u64 {
match self {
impl<'a> CandidateRouteHop<'a> {
fn short_channel_id(&self) -> u64 {
match self {
- CandidateRouteHop::FirstHop { details } => details.
short_channel_id
.unwrap(),
+ CandidateRouteHop::FirstHop { details } => details.
get_outbound_payment_scid()
.unwrap(),
CandidateRouteHop::PublicHop { short_channel_id, .. } => *short_channel_id,
CandidateRouteHop::PrivateHop { hint } => hint.short_channel_id,
}
CandidateRouteHop::PublicHop { short_channel_id, .. } => *short_channel_id,
CandidateRouteHop::PrivateHop { hint } => hint.short_channel_id,
}
@@
-801,7
+801,7
@@
where L::Target: Logger {
HashMap::with_capacity(if first_hops.is_some() { first_hops.as_ref().unwrap().len() } else { 0 });
if let Some(hops) = first_hops {
for chan in hops {
HashMap::with_capacity(if first_hops.is_some() { first_hops.as_ref().unwrap().len() } else { 0 });
if let Some(hops) = first_hops {
for chan in hops {
- if chan.
short_channel_id
.is_none() {
+ if chan.
get_outbound_payment_scid()
.is_none() {
panic!("first_hops should be filled in with usable channels, not pending ones");
}
if chan.counterparty.node_id == *our_node_pubkey {
panic!("first_hops should be filled in with usable channels, not pending ones");
}
if chan.counterparty.node_id == *our_node_pubkey {
@@
-1411,7
+1411,7
@@
where L::Target: Logger {
let mut features_set = false;
if let Some(first_channels) = first_hop_targets.get(&ordered_hops.last().unwrap().0.node_id) {
for details in first_channels {
let mut features_set = false;
if let Some(first_channels) = first_hop_targets.get(&ordered_hops.last().unwrap().0.node_id) {
for details in first_channels {
- if details.
short_channel_id
.unwrap() == ordered_hops.last().unwrap().0.candidate.short_channel_id() {
+ if details.
get_outbound_payment_scid()
.unwrap() == ordered_hops.last().unwrap().0.candidate.short_channel_id() {
ordered_hops.last_mut().unwrap().1 = details.counterparty.features.to_context();
features_set = true;
break;
ordered_hops.last_mut().unwrap().1 = details.counterparty.features.to_context();
features_set = true;
break;
@@
-1906,6
+1906,7
@@
mod tests {
funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
channel_type: None,
short_channel_id,
funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
channel_type: None,
short_channel_id,
+ outbound_scid_alias: None,
inbound_scid_alias: None,
channel_value_satoshis: 0,
user_channel_id: 0,
inbound_scid_alias: None,
channel_value_satoshis: 0,
user_channel_id: 0,
@@
-1916,7
+1917,7
@@
mod tests {
unspendable_punishment_reserve: None,
confirmations_required: None,
force_close_spend_delay: None,
unspendable_punishment_reserve: None,
confirmations_required: None,
force_close_spend_delay: None,
- is_outbound: true, is_
funding_locked
: true,
+ is_outbound: true, is_
channel_ready
: true,
is_usable: true, is_public: true,
inbound_htlc_minimum_msat: None,
inbound_htlc_maximum_msat: None,
is_usable: true, is_public: true,
inbound_htlc_minimum_msat: None,
inbound_htlc_maximum_msat: None,
@@
-5738,6
+5739,7
@@
mod benches {
channel_type: None,
short_channel_id: Some(1),
inbound_scid_alias: None,
channel_type: None,
short_channel_id: Some(1),
inbound_scid_alias: None,
+ outbound_scid_alias: None,
channel_value_satoshis: 10_000_000,
user_channel_id: 0,
balance_msat: 10_000_000,
channel_value_satoshis: 10_000_000,
user_channel_id: 0,
balance_msat: 10_000_000,
@@
-5748,7
+5750,7
@@
mod benches {
confirmations_required: None,
force_close_spend_delay: None,
is_outbound: true,
confirmations_required: None,
force_close_spend_delay: None,
is_outbound: true,
- is_
funding_locked
: true,
+ is_
channel_ready
: true,
is_usable: true,
is_public: true,
inbound_htlc_minimum_msat: None,
is_usable: true,
is_public: true,
inbound_htlc_minimum_msat: None,