projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct `outbound_payment` route-fetch calls to pass the hash + ID
[rust-lightning]
/
lightning
/
src
/
routing
/
gossip.rs
diff --git
a/lightning/src/routing/gossip.rs
b/lightning/src/routing/gossip.rs
index 2b4ece0ba6bd02d523acd234468f6277d0c73c8e..12b685fbff183b34c5241bc7c2a4f906b0449550 100644
(file)
--- a/
lightning/src/routing/gossip.rs
+++ b/
lightning/src/routing/gossip.rs
@@
-791,7
+791,7
@@
pub struct ChannelInfo {
impl ChannelInfo {
/// Returns a [`DirectedChannelInfo`] for the channel directed to the given `target` from a
/// returned `source`, or `None` if `target` is not one of the channel's counterparties.
impl ChannelInfo {
/// Returns a [`DirectedChannelInfo`] for the channel directed to the given `target` from a
/// returned `source`, or `None` if `target` is not one of the channel's counterparties.
- pub fn as_directed_to(&self, target: &NodeId) -> Option<(DirectedChannelInfo, &NodeId)> {
+ pub
(crate)
fn as_directed_to(&self, target: &NodeId) -> Option<(DirectedChannelInfo, &NodeId)> {
let (direction, source) = {
if target == &self.node_one {
(self.two_to_one.as_ref(), &self.node_two)
let (direction, source) = {
if target == &self.node_one {
(self.two_to_one.as_ref(), &self.node_two)
@@
-806,7
+806,7
@@
impl ChannelInfo {
/// Returns a [`DirectedChannelInfo`] for the channel directed from the given `source` to a
/// returned `target`, or `None` if `source` is not one of the channel's counterparties.
/// Returns a [`DirectedChannelInfo`] for the channel directed from the given `source` to a
/// returned `target`, or `None` if `source` is not one of the channel's counterparties.
- pub fn as_directed_from(&self, source: &NodeId) -> Option<(DirectedChannelInfo, &NodeId)> {
+ pub
(crate)
fn as_directed_from(&self, source: &NodeId) -> Option<(DirectedChannelInfo, &NodeId)> {
let (direction, target) = {
if source == &self.node_one {
(self.one_to_two.as_ref(), &self.node_two)
let (direction, target) = {
if source == &self.node_one {
(self.one_to_two.as_ref(), &self.node_two)
@@
-886,9
+886,9
@@
impl Readable for ChannelInfo {
(0, features, required),
(1, announcement_received_time, (default_value, 0)),
(2, node_one, required),
(0, features, required),
(1, announcement_received_time, (default_value, 0)),
(2, node_one, required),
- (4, one_to_two_wrap,
ignorable
),
+ (4, one_to_two_wrap,
upgradable_option
),
(6, node_two, required),
(6, node_two, required),
- (8, two_to_one_wrap,
ignorable
),
+ (8, two_to_one_wrap,
upgradable_option
),
(10, capacity_sats, required),
(12, announcement_message, required),
});
(10, capacity_sats, required),
(12, announcement_message, required),
});
@@
-1020,7
+1020,7
@@
impl EffectiveCapacity {
/// Fees for routing via a given channel or a node
#[derive(Eq, PartialEq, Copy, Clone, Debug, Hash)]
pub struct RoutingFees {
/// Fees for routing via a given channel or a node
#[derive(Eq, PartialEq, Copy, Clone, Debug, Hash)]
pub struct RoutingFees {
- /// Flat routing fee in
satoshis
+ /// Flat routing fee in
millisatoshis.
pub base_msat: u32,
/// Liquidity-based routing fee in millionths of a routed amount.
/// In other words, 10000 is 1%.
pub base_msat: u32,
/// Liquidity-based routing fee in millionths of a routed amount.
/// In other words, 10000 is 1%.
@@
-1164,7
+1164,7
@@
impl Readable for NodeInfo {
read_tlv_fields!(reader, {
(0, _lowest_inbound_channel_fees, option),
read_tlv_fields!(reader, {
(0, _lowest_inbound_channel_fees, option),
- (2, announcement_info_wrap,
ignorable
),
+ (2, announcement_info_wrap,
upgradable_option
),
(4, channels, vec_type),
});
(4, channels, vec_type),
});