Skip to content

[#2189] Score Fee Params as a passed in parameter#2237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 2 commits into from
May 11, 2023
Merged

[#2189] Score Fee Params as a passed in parameter #2237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21b0818
Score's FeeParams as passed-in params on Routefinding functions
henghonglee May 6, 2023
86af670
Move functions around to colocate impl of FeeParams and DecayParams
henghonglee May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, ReadableArgs, Writeable};
use lightning::util::ser::{ReadableArgs, Writeable};
Comment thread
henghonglee marked this conversation as resolved.

use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;
Expand Down
6 changes: 3 additions & 3 deletions fuzz/src/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::ln::msgs;
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::ProbabilisticScorer;
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters};
use lightning::util::config::UserConfig;
use lightning::util::ser::Readable;

Expand DownExpand Up@@ -293,7 +293,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
}]));
}
}
let scorer = ProbabilisticScorer::new(Default::default(), &net_graph, &logger);
let scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &net_graph, &logger);
let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
for target in node_pks.iter() {
let final_value_msat = slice_to_be64(get_slice!(8));
Expand All@@ -305,7 +305,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
};
let _ = find_route(&our_pubkey, &route_params, &net_graph,
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
&logger, &scorer, &random_seed_bytes);
&logger, &scorer, &ProbabilisticScoringFeeParameters::default(), &random_seed_bytes);
}
},
}
Expand Down
7 changes: 4 additions & 3 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -866,7 +866,7 @@ mod tests {
fn disconnect_socket(&mut self) {}
}

type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>>>, Arc<test_utils::TestLogger>>;
type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>, (), TestScorer>>, Arc<test_utils::TestLogger>>;

type ChainMonitor = chainmonitor::ChainMonitor<InMemorySigner, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;

Expand DownExpand Up@@ -1000,8 +1000,9 @@ mod tests {
}

impl Score for TestScorer {
type ScoreParams = ();
fn channel_penalty_msat(
&self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
&self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage, _score_params: &Self::ScoreParams
) -> u64 { unimplemented!(); }

fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
Expand DownExpand Up@@ -1114,7 +1115,7 @@ mod tests {
let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
let scorer = Arc::new(Mutex::new(TestScorer::new()));
let seed = [i as u8; 32];
let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), ()));
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", &persist_dir, i)));
let now = Duration::from_secs(genesis_block.header.time as u64);
Expand Down
16 changes: 9 additions & 7 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
use crate::ln::msgs;
use crate::ln::onion_utils;
use crate::ln::onion_utils::HTLCFailReason;
Expand DownExpand Up@@ -625,7 +625,9 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
Arc<DefaultRouter<
Arc<NetworkGraph<Arc<L>>>,
Arc<L>,
Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>
Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
ProbabilisticScoringFeeParameters,
ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>,
>>,
Arc<L>
>;
Expand All@@ -641,7 +643,7 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
/// of [`KeysManager`] and [`DefaultRouter`].
///
/// This is not exported to bindings users as Arcs don't make sense in bindings
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>>, &'g L>;
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, ProbabilisticScoringFeeParameters, ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, &'g L>;

/// A trivial trait which describes any [`ChannelManager`] used in testing.
#[cfg(any(test, feature = "_test_utils"))]
Expand DownExpand Up@@ -8584,7 +8586,7 @@ mod tests {
};
let route = find_route(
&nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
None, nodes[0].logger, &scorer, &random_seed_bytes
None, nodes[0].logger, &scorer, &(), &random_seed_bytes
).unwrap();
nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8618,7 +8620,7 @@ mod tests {
let payment_preimage = PaymentPreimage([42; 32]);
let route = find_route(
&nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
None, nodes[0].logger, &scorer, &random_seed_bytes
None, nodes[0].logger, &scorer, &(), &random_seed_bytes
).unwrap();
let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8681,7 +8683,7 @@ mod tests {
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
nodes[0].logger, &scorer, &random_seed_bytes
nodes[0].logger, &scorer, &(), &random_seed_bytes
).unwrap();

let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -8725,7 +8727,7 @@ mod tests {
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
nodes[0].logger, &scorer, &random_seed_bytes
nodes[0].logger, &scorer, &(), &random_seed_bytes
).unwrap();

let test_preimage = PaymentPreimage([42; 32]);
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1738,7 +1738,7 @@ pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_valu
router::get_route(
&send_node.node.get_our_node_id(), payment_params, &send_node.network_graph.read_only(),
Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
recv_value, send_node.logger, &scorer, &random_seed_bytes
recv_value, send_node.logger, &scorer, &(), &random_seed_bytes
)
}

Expand DownExpand Up@@ -2328,7 +2328,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let route = router::get_route(
&origin_node.node.get_our_node_id(), &payment_params, &network_graph,
None, recv_value, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
None, recv_value, origin_node.logger, &scorer, &(), &random_seed_bytes).unwrap();
assert_eq!(route.paths.len(), 1);
assert_eq!(route.paths[0].hops.len(), expected_route.len());
for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
Expand Down
10 changes: 5 additions & 5 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7044,7 +7044,7 @@ fn test_check_htlc_underpaying() {
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7298,11 +7298,11 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);

let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
Expand DownExpand Up@@ -9520,7 +9520,7 @@ fn test_keysend_payments_to_public_node() {
};
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();

let test_preimage = PaymentPreimage([42; 32]);
let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage),
Expand DownExpand Up@@ -9555,7 +9555,7 @@ fn test_keysend_payments_to_private_node() {
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
nodes[0].logger, &scorer, &random_seed_bytes
nodes[0].logger, &scorer, &(), &random_seed_bytes
).unwrap();

let test_preimage = PaymentPreimage([42; 32]);
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/onion_route_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -993,7 +993,7 @@ macro_rules! get_phantom_route {
(get_route(
&$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
$amt, $nodes[0].logger, &scorer, &[0u8; 32]
$amt, $nodes[0].logger, &scorer, &(), &[0u8; 32]
).unwrap(), phantom_route_hint.phantom_scid)
}
}}
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/ln/payment_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -864,7 +864,7 @@ fn get_ldk_payment_preimage() {
let route = get_route(
&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(),
Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
amt_msat, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
amt_msat, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
nodes[0].node.send_payment_with_route(&route, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1418,7 +1418,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
let route = get_route(
&nodes[0].node.get_our_node_id(), &route_params.payment_params,
&nodes[0].network_graph.read_only(), None, route_params.final_value_msat,
nodes[0].logger, &scorer, &random_seed_bytes,
nodes[0].logger, &scorer, &(), &random_seed_bytes,
).unwrap();

let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/ln/shutdown_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,9 +95,9 @@ fn updates_shutdown_wait() {
let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);

let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
), true, APIError::ChannelUnavailable {..}, {});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[#2189] Score Fee Params as a passed in parameter by henghonglee · Pull Request #2237 · lightningdevkit/rust-lightning · GitHub
Skip to content
[#2189] Score Fee Params as a passed in parameter#2237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

May 11, 2023
 Merged


[#2189] Score Fee Params as a passed in parameter
#2237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21b0818

Score's FeeParams as passed-in params on Routefinding functions


henghonglee May 6, 2023
86af670

Move functions around to colocate impl of FeeParams and DecayParams


henghonglee May 10, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, ReadableArgs, Writeable};
use lightning::util::ser::{ReadableArgs, Writeable};
Comment thread
henghonglee marked this conversation as resolved.


use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::ln::msgs;
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::ProbabilisticScorer;
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters};
use lightning::util::config::UserConfig;
use lightning::util::ser::Readable;

Expand DownExpand Up@@ -293,7 +293,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }]));
 }
 }
 let scorer = ProbabilisticScorer::new(Default::default(), &net_graph, &logger);
 let scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &net_graph, &logger);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let final_value_msat = slice_to_be64(get_slice!(8));
Expand All@@ -305,7 +305,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 &logger, &scorer, &random_seed_bytes);
 &logger, &scorer, &ProbabilisticScoringFeeParameters::default(), &random_seed_bytes);
 }
 },
 }
Expand Down

7 changes: 4 additions & 3 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,7 +866,7 @@ mod tests {
 fn disconnect_socket(&mut self) {}
	}

	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>>>, Arc<test_utils::TestLogger>>;
	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>, (), TestScorer>>, Arc<test_utils::TestLogger>>;

	type ChainMonitor = chainmonitor::ChainMonitor<InMemorySigner, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;

Expand DownExpand Up@@ -1000,8 +1000,9 @@ mod tests {
	}

	impl Score for TestScorer {
 type ScoreParams = ();
 fn channel_penalty_msat(
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage, _score_params: &Self::ScoreParams
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
Expand DownExpand Up@@ -1114,7 +1115,7 @@ mod tests {
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), ()));
 let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
 let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", &persist_dir, i)));
 let now = Duration::from_secs(genesis_block.header.time as u64);
Expand Down

16 changes: 9 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
use crate::ln::msgs;
use crate::ln::onion_utils;
use crate::ln::onion_utils::HTLCFailReason;
Expand DownExpand Up@@ -625,7 +625,9 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
	Arc<DefaultRouter<
 Arc<NetworkGraph<Arc<L>>>,
 Arc<L>,
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
 ProbabilisticScoringFeeParameters,
 ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>,
	>>,
	Arc<L>
>;
Expand All@@ -641,7 +643,7 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
/// of [`KeysManager`] and [`DefaultRouter`].
///
/// This is not exported to bindings users as Arcs don't make sense in bindings
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>>, &'g L>;
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, ProbabilisticScoringFeeParameters, ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, &'g L>;

/// A trivial trait which describes any [`ChannelManager`] used in testing.
#[cfg(any(test, feature = "_test_utils"))]
Expand DownExpand Up@@ -8584,7 +8586,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8618,7 +8620,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8681,7 +8683,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -8725,7 +8727,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1738,7 +1738,7 @@ pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_valu
	router::get_route(
 &send_node.node.get_our_node_id(), payment_params, &send_node.network_graph.read_only(),
 Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, send_node.logger, &scorer, &random_seed_bytes
 recv_value, send_node.logger, &scorer, &(), &random_seed_bytes
	)
}

Expand DownExpand Up@@ -2328,7 +2328,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = router::get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
 None, recv_value, origin_node.logger, &scorer, &(), &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7044,7 +7044,7 @@ fn test_check_htlc_underpaying() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
	nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7298,11 +7298,11 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);

	let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
Expand DownExpand Up@@ -9520,7 +9520,7 @@ fn test_keysend_payments_to_public_node() {
	};
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
	let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage),
Expand DownExpand Up@@ -9555,7 +9555,7 @@ fn test_keysend_payments_to_private_node() {
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
	).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -993,7 +993,7 @@ macro_rules! get_phantom_route {
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
 Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 $amt, $nodes[0].logger, &scorer, &[0u8; 32]
 $amt, $nodes[0].logger, &scorer, &(), &[0u8; 32]
 ).unwrap(), phantom_route_hint.phantom_scid)
	}
}}
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -864,7 +864,7 @@ fn get_ldk_payment_preimage() {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(),
 Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 amt_msat, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 amt_msat, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	nodes[0].node.send_payment_with_route(&route, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1418,7 +1418,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &route_params.payment_params,
 &nodes[0].network_graph.read_only(), None, route_params.final_value_msat,
 nodes[0].logger, &scorer, &random_seed_bytes,
 nodes[0].logger, &scorer, &(), &random_seed_bytes,
	).unwrap();

	let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/shutdown_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,9 +95,9 @@ fn updates_shutdown_wait() {
	let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);

	let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
 ), true, APIError::ChannelUnavailable {..}, {});
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[#2189] Score Fee Params as a passed in parameter by henghonglee · Pull Request #2237 · lightningdevkit/rust-lightning · GitHub
Skip to content
[#2189] Score Fee Params as a passed in parameter#2237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

May 11, 2023
 Merged


[#2189] Score Fee Params as a passed in parameter
#2237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21b0818

Score's FeeParams as passed-in params on Routefinding functions


henghonglee May 6, 2023
86af670

Move functions around to colocate impl of FeeParams and DecayParams


henghonglee May 10, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, ReadableArgs, Writeable};
use lightning::util::ser::{ReadableArgs, Writeable};
Comment thread
henghonglee marked this conversation as resolved.


use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::ln::msgs;
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::ProbabilisticScorer;
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters};
use lightning::util::config::UserConfig;
use lightning::util::ser::Readable;

Expand DownExpand Up@@ -293,7 +293,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }]));
 }
 }
 let scorer = ProbabilisticScorer::new(Default::default(), &net_graph, &logger);
 let scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &net_graph, &logger);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let final_value_msat = slice_to_be64(get_slice!(8));
Expand All@@ -305,7 +305,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 &logger, &scorer, &random_seed_bytes);
 &logger, &scorer, &ProbabilisticScoringFeeParameters::default(), &random_seed_bytes);
 }
 },
 }
Expand Down

7 changes: 4 additions & 3 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,7 +866,7 @@ mod tests {
 fn disconnect_socket(&mut self) {}
	}

	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>>>, Arc<test_utils::TestLogger>>;
	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>, (), TestScorer>>, Arc<test_utils::TestLogger>>;

	type ChainMonitor = chainmonitor::ChainMonitor<InMemorySigner, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;

Expand DownExpand Up@@ -1000,8 +1000,9 @@ mod tests {
	}

	impl Score for TestScorer {
 type ScoreParams = ();
 fn channel_penalty_msat(
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage, _score_params: &Self::ScoreParams
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
Expand DownExpand Up@@ -1114,7 +1115,7 @@ mod tests {
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), ()));
 let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
 let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", &persist_dir, i)));
 let now = Duration::from_secs(genesis_block.header.time as u64);
Expand Down

16 changes: 9 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
use crate::ln::msgs;
use crate::ln::onion_utils;
use crate::ln::onion_utils::HTLCFailReason;
Expand DownExpand Up@@ -625,7 +625,9 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
	Arc<DefaultRouter<
 Arc<NetworkGraph<Arc<L>>>,
 Arc<L>,
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
 ProbabilisticScoringFeeParameters,
 ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>,
	>>,
	Arc<L>
>;
Expand All@@ -641,7 +643,7 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
/// of [`KeysManager`] and [`DefaultRouter`].
///
/// This is not exported to bindings users as Arcs don't make sense in bindings
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>>, &'g L>;
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, ProbabilisticScoringFeeParameters, ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, &'g L>;

/// A trivial trait which describes any [`ChannelManager`] used in testing.
#[cfg(any(test, feature = "_test_utils"))]
Expand DownExpand Up@@ -8584,7 +8586,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8618,7 +8620,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8681,7 +8683,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -8725,7 +8727,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1738,7 +1738,7 @@ pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_valu
	router::get_route(
 &send_node.node.get_our_node_id(), payment_params, &send_node.network_graph.read_only(),
 Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, send_node.logger, &scorer, &random_seed_bytes
 recv_value, send_node.logger, &scorer, &(), &random_seed_bytes
	)
}

Expand DownExpand Up@@ -2328,7 +2328,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = router::get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
 None, recv_value, origin_node.logger, &scorer, &(), &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7044,7 +7044,7 @@ fn test_check_htlc_underpaying() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
	nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7298,11 +7298,11 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);

	let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
Expand DownExpand Up@@ -9520,7 +9520,7 @@ fn test_keysend_payments_to_public_node() {
	};
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
	let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage),
Expand DownExpand Up@@ -9555,7 +9555,7 @@ fn test_keysend_payments_to_private_node() {
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
	).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -993,7 +993,7 @@ macro_rules! get_phantom_route {
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
 Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 $amt, $nodes[0].logger, &scorer, &[0u8; 32]
 $amt, $nodes[0].logger, &scorer, &(), &[0u8; 32]
 ).unwrap(), phantom_route_hint.phantom_scid)
	}
}}
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -864,7 +864,7 @@ fn get_ldk_payment_preimage() {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(),
 Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 amt_msat, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 amt_msat, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	nodes[0].node.send_payment_with_route(&route, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1418,7 +1418,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &route_params.payment_params,
 &nodes[0].network_graph.read_only(), None, route_params.final_value_msat,
 nodes[0].logger, &scorer, &random_seed_bytes,
 nodes[0].logger, &scorer, &(), &random_seed_bytes,
	).unwrap();

	let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/shutdown_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,9 +95,9 @@ fn updates_shutdown_wait() {
	let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);

	let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
 ), true, APIError::ChannelUnavailable {..}, {});
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[#2189] Score Fee Params as a passed in parameter by henghonglee · Pull Request #2237 · lightningdevkit/rust-lightning · GitHub
Skip to content
[#2189] Score Fee Params as a passed in parameter#2237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

May 11, 2023
 Merged


[#2189] Score Fee Params as a passed in parameter
#2237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21b0818

Score's FeeParams as passed-in params on Routefinding functions


henghonglee May 6, 2023
86af670

Move functions around to colocate impl of FeeParams and DecayParams


henghonglee May 10, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, ReadableArgs, Writeable};
use lightning::util::ser::{ReadableArgs, Writeable};
Comment thread
henghonglee marked this conversation as resolved.


use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::ln::msgs;
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::ProbabilisticScorer;
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters};
use lightning::util::config::UserConfig;
use lightning::util::ser::Readable;

Expand DownExpand Up@@ -293,7 +293,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }]));
 }
 }
 let scorer = ProbabilisticScorer::new(Default::default(), &net_graph, &logger);
 let scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &net_graph, &logger);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let final_value_msat = slice_to_be64(get_slice!(8));
Expand All@@ -305,7 +305,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 &logger, &scorer, &random_seed_bytes);
 &logger, &scorer, &ProbabilisticScoringFeeParameters::default(), &random_seed_bytes);
 }
 },
 }
Expand Down

7 changes: 4 additions & 3 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,7 +866,7 @@ mod tests {
 fn disconnect_socket(&mut self) {}
	}

	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>>>, Arc<test_utils::TestLogger>>;
	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>, (), TestScorer>>, Arc<test_utils::TestLogger>>;

	type ChainMonitor = chainmonitor::ChainMonitor<InMemorySigner, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;

Expand DownExpand Up@@ -1000,8 +1000,9 @@ mod tests {
	}

	impl Score for TestScorer {
 type ScoreParams = ();
 fn channel_penalty_msat(
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage, _score_params: &Self::ScoreParams
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
Expand DownExpand Up@@ -1114,7 +1115,7 @@ mod tests {
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), ()));
 let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
 let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", &persist_dir, i)));
 let now = Duration::from_secs(genesis_block.header.time as u64);
Expand Down

16 changes: 9 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
use crate::ln::msgs;
use crate::ln::onion_utils;
use crate::ln::onion_utils::HTLCFailReason;
Expand DownExpand Up@@ -625,7 +625,9 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
	Arc<DefaultRouter<
 Arc<NetworkGraph<Arc<L>>>,
 Arc<L>,
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
 ProbabilisticScoringFeeParameters,
 ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>,
	>>,
	Arc<L>
>;
Expand All@@ -641,7 +643,7 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
/// of [`KeysManager`] and [`DefaultRouter`].
///
/// This is not exported to bindings users as Arcs don't make sense in bindings
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>>, &'g L>;
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, ProbabilisticScoringFeeParameters, ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, &'g L>;

/// A trivial trait which describes any [`ChannelManager`] used in testing.
#[cfg(any(test, feature = "_test_utils"))]
Expand DownExpand Up@@ -8584,7 +8586,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8618,7 +8620,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8681,7 +8683,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -8725,7 +8727,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1738,7 +1738,7 @@ pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_valu
	router::get_route(
 &send_node.node.get_our_node_id(), payment_params, &send_node.network_graph.read_only(),
 Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, send_node.logger, &scorer, &random_seed_bytes
 recv_value, send_node.logger, &scorer, &(), &random_seed_bytes
	)
}

Expand DownExpand Up@@ -2328,7 +2328,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = router::get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
 None, recv_value, origin_node.logger, &scorer, &(), &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7044,7 +7044,7 @@ fn test_check_htlc_underpaying() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
	nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7298,11 +7298,11 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);

	let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
Expand DownExpand Up@@ -9520,7 +9520,7 @@ fn test_keysend_payments_to_public_node() {
	};
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
	let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage),
Expand DownExpand Up@@ -9555,7 +9555,7 @@ fn test_keysend_payments_to_private_node() {
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
	).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -993,7 +993,7 @@ macro_rules! get_phantom_route {
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
 Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 $amt, $nodes[0].logger, &scorer, &[0u8; 32]
 $amt, $nodes[0].logger, &scorer, &(), &[0u8; 32]
 ).unwrap(), phantom_route_hint.phantom_scid)
	}
}}
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -864,7 +864,7 @@ fn get_ldk_payment_preimage() {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(),
 Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 amt_msat, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 amt_msat, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	nodes[0].node.send_payment_with_route(&route, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1418,7 +1418,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &route_params.payment_params,
 &nodes[0].network_graph.read_only(), None, route_params.final_value_msat,
 nodes[0].logger, &scorer, &random_seed_bytes,
 nodes[0].logger, &scorer, &(), &random_seed_bytes,
	).unwrap();

	let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/shutdown_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,9 +95,9 @@ fn updates_shutdown_wait() {
	let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);

	let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
 ), true, APIError::ChannelUnavailable {..}, {});
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[#2189] Score Fee Params as a passed in parameter by henghonglee · Pull Request #2237 · lightningdevkit/rust-lightning · GitHub
Skip to content
[#2189] Score Fee Params as a passed in parameter#2237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

May 11, 2023
 Merged


[#2189] Score Fee Params as a passed in parameter
#2237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21b0818

Score's FeeParams as passed-in params on Routefinding functions


henghonglee May 6, 2023
86af670

Move functions around to colocate impl of FeeParams and DecayParams


henghonglee May 10, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, ReadableArgs, Writeable};
use lightning::util::ser::{ReadableArgs, Writeable};
Comment thread
henghonglee marked this conversation as resolved.


use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::ln::msgs;
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::ProbabilisticScorer;
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters};
use lightning::util::config::UserConfig;
use lightning::util::ser::Readable;

Expand DownExpand Up@@ -293,7 +293,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }]));
 }
 }
 let scorer = ProbabilisticScorer::new(Default::default(), &net_graph, &logger);
 let scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &net_graph, &logger);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let final_value_msat = slice_to_be64(get_slice!(8));
Expand All@@ -305,7 +305,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 &logger, &scorer, &random_seed_bytes);
 &logger, &scorer, &ProbabilisticScoringFeeParameters::default(), &random_seed_bytes);
 }
 },
 }
Expand Down

7 changes: 4 additions & 3 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,7 +866,7 @@ mod tests {
 fn disconnect_socket(&mut self) {}
	}

	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>>>, Arc<test_utils::TestLogger>>;
	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>, (), TestScorer>>, Arc<test_utils::TestLogger>>;

	type ChainMonitor = chainmonitor::ChainMonitor<InMemorySigner, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;

Expand DownExpand Up@@ -1000,8 +1000,9 @@ mod tests {
	}

	impl Score for TestScorer {
 type ScoreParams = ();
 fn channel_penalty_msat(
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage, _score_params: &Self::ScoreParams
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
Expand DownExpand Up@@ -1114,7 +1115,7 @@ mod tests {
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), ()));
 let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
 let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", &persist_dir, i)));
 let now = Duration::from_secs(genesis_block.header.time as u64);
Expand Down

16 changes: 9 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
use crate::ln::msgs;
use crate::ln::onion_utils;
use crate::ln::onion_utils::HTLCFailReason;
Expand DownExpand Up@@ -625,7 +625,9 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
	Arc<DefaultRouter<
 Arc<NetworkGraph<Arc<L>>>,
 Arc<L>,
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
 ProbabilisticScoringFeeParameters,
 ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>,
	>>,
	Arc<L>
>;
Expand All@@ -641,7 +643,7 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
/// of [`KeysManager`] and [`DefaultRouter`].
///
/// This is not exported to bindings users as Arcs don't make sense in bindings
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>>, &'g L>;
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, ProbabilisticScoringFeeParameters, ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, &'g L>;

/// A trivial trait which describes any [`ChannelManager`] used in testing.
#[cfg(any(test, feature = "_test_utils"))]
Expand DownExpand Up@@ -8584,7 +8586,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8618,7 +8620,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8681,7 +8683,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -8725,7 +8727,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1738,7 +1738,7 @@ pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_valu
	router::get_route(
 &send_node.node.get_our_node_id(), payment_params, &send_node.network_graph.read_only(),
 Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, send_node.logger, &scorer, &random_seed_bytes
 recv_value, send_node.logger, &scorer, &(), &random_seed_bytes
	)
}

Expand DownExpand Up@@ -2328,7 +2328,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = router::get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
 None, recv_value, origin_node.logger, &scorer, &(), &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7044,7 +7044,7 @@ fn test_check_htlc_underpaying() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
	nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7298,11 +7298,11 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);

	let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
Expand DownExpand Up@@ -9520,7 +9520,7 @@ fn test_keysend_payments_to_public_node() {
	};
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
	let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage),
Expand DownExpand Up@@ -9555,7 +9555,7 @@ fn test_keysend_payments_to_private_node() {
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
	).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -993,7 +993,7 @@ macro_rules! get_phantom_route {
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
 Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 $amt, $nodes[0].logger, &scorer, &[0u8; 32]
 $amt, $nodes[0].logger, &scorer, &(), &[0u8; 32]
 ).unwrap(), phantom_route_hint.phantom_scid)
	}
}}
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -864,7 +864,7 @@ fn get_ldk_payment_preimage() {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(),
 Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 amt_msat, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 amt_msat, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	nodes[0].node.send_payment_with_route(&route, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1418,7 +1418,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &route_params.payment_params,
 &nodes[0].network_graph.read_only(), None, route_params.final_value_msat,
 nodes[0].logger, &scorer, &random_seed_bytes,
 nodes[0].logger, &scorer, &(), &random_seed_bytes,
	).unwrap();

	let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/shutdown_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,9 +95,9 @@ fn updates_shutdown_wait() {
	let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);

	let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
 ), true, APIError::ChannelUnavailable {..}, {});
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[#2189] Score Fee Params as a passed in parameter by henghonglee · Pull Request #2237 · lightningdevkit/rust-lightning · GitHub
Skip to content
[#2189] Score Fee Params as a passed in parameter#2237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

May 11, 2023
 Merged


[#2189] Score Fee Params as a passed in parameter
#2237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21b0818

Score's FeeParams as passed-in params on Routefinding functions


henghonglee May 6, 2023
86af670

Move functions around to colocate impl of FeeParams and DecayParams


henghonglee May 10, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, ReadableArgs, Writeable};
use lightning::util::ser::{ReadableArgs, Writeable};
Comment thread
henghonglee marked this conversation as resolved.


use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::ln::msgs;
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::ProbabilisticScorer;
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters};
use lightning::util::config::UserConfig;
use lightning::util::ser::Readable;

Expand DownExpand Up@@ -293,7 +293,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }]));
 }
 }
 let scorer = ProbabilisticScorer::new(Default::default(), &net_graph, &logger);
 let scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &net_graph, &logger);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let final_value_msat = slice_to_be64(get_slice!(8));
Expand All@@ -305,7 +305,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 &logger, &scorer, &random_seed_bytes);
 &logger, &scorer, &ProbabilisticScoringFeeParameters::default(), &random_seed_bytes);
 }
 },
 }
Expand Down

7 changes: 4 additions & 3 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,7 +866,7 @@ mod tests {
 fn disconnect_socket(&mut self) {}
	}

	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>>>, Arc<test_utils::TestLogger>>;
	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>, (), TestScorer>>, Arc<test_utils::TestLogger>>;

	type ChainMonitor = chainmonitor::ChainMonitor<InMemorySigner, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;

Expand DownExpand Up@@ -1000,8 +1000,9 @@ mod tests {
	}

	impl Score for TestScorer {
 type ScoreParams = ();
 fn channel_penalty_msat(
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage, _score_params: &Self::ScoreParams
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
Expand DownExpand Up@@ -1114,7 +1115,7 @@ mod tests {
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), ()));
 let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
 let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", &persist_dir, i)));
 let now = Duration::from_secs(genesis_block.header.time as u64);
Expand Down

16 changes: 9 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
use crate::ln::msgs;
use crate::ln::onion_utils;
use crate::ln::onion_utils::HTLCFailReason;
Expand DownExpand Up@@ -625,7 +625,9 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
	Arc<DefaultRouter<
 Arc<NetworkGraph<Arc<L>>>,
 Arc<L>,
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
 ProbabilisticScoringFeeParameters,
 ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>,
	>>,
	Arc<L>
>;
Expand All@@ -641,7 +643,7 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
/// of [`KeysManager`] and [`DefaultRouter`].
///
/// This is not exported to bindings users as Arcs don't make sense in bindings
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>>, &'g L>;
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, ProbabilisticScoringFeeParameters, ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, &'g L>;

/// A trivial trait which describes any [`ChannelManager`] used in testing.
#[cfg(any(test, feature = "_test_utils"))]
Expand DownExpand Up@@ -8584,7 +8586,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8618,7 +8620,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8681,7 +8683,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -8725,7 +8727,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1738,7 +1738,7 @@ pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_valu
	router::get_route(
 &send_node.node.get_our_node_id(), payment_params, &send_node.network_graph.read_only(),
 Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, send_node.logger, &scorer, &random_seed_bytes
 recv_value, send_node.logger, &scorer, &(), &random_seed_bytes
	)
}

Expand DownExpand Up@@ -2328,7 +2328,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = router::get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
 None, recv_value, origin_node.logger, &scorer, &(), &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7044,7 +7044,7 @@ fn test_check_htlc_underpaying() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
	nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7298,11 +7298,11 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);

	let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
Expand DownExpand Up@@ -9520,7 +9520,7 @@ fn test_keysend_payments_to_public_node() {
	};
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
	let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage),
Expand DownExpand Up@@ -9555,7 +9555,7 @@ fn test_keysend_payments_to_private_node() {
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
	).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -993,7 +993,7 @@ macro_rules! get_phantom_route {
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
 Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 $amt, $nodes[0].logger, &scorer, &[0u8; 32]
 $amt, $nodes[0].logger, &scorer, &(), &[0u8; 32]
 ).unwrap(), phantom_route_hint.phantom_scid)
	}
}}
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -864,7 +864,7 @@ fn get_ldk_payment_preimage() {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(),
 Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 amt_msat, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 amt_msat, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	nodes[0].node.send_payment_with_route(&route, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1418,7 +1418,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &route_params.payment_params,
 &nodes[0].network_graph.read_only(), None, route_params.final_value_msat,
 nodes[0].logger, &scorer, &random_seed_bytes,
 nodes[0].logger, &scorer, &(), &random_seed_bytes,
	).unwrap();

	let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/shutdown_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,9 +95,9 @@ fn updates_shutdown_wait() {
	let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);

	let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
 ), true, APIError::ChannelUnavailable {..}, {});
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[#2189] Score Fee Params as a passed in parameter by henghonglee · Pull Request #2237 · lightningdevkit/rust-lightning · GitHub
Skip to content
[#2189] Score Fee Params as a passed in parameter#2237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

May 11, 2023
 Merged


[#2189] Score Fee Params as a passed in parameter
#2237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21b0818

Score's FeeParams as passed-in params on Routefinding functions


henghonglee May 6, 2023
86af670

Move functions around to colocate impl of FeeParams and DecayParams


henghonglee May 10, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, ReadableArgs, Writeable};
use lightning::util::ser::{ReadableArgs, Writeable};
Comment thread
henghonglee marked this conversation as resolved.


use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::ln::msgs;
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::ProbabilisticScorer;
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters};
use lightning::util::config::UserConfig;
use lightning::util::ser::Readable;

Expand DownExpand Up@@ -293,7 +293,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }]));
 }
 }
 let scorer = ProbabilisticScorer::new(Default::default(), &net_graph, &logger);
 let scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &net_graph, &logger);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let final_value_msat = slice_to_be64(get_slice!(8));
Expand All@@ -305,7 +305,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 &logger, &scorer, &random_seed_bytes);
 &logger, &scorer, &ProbabilisticScoringFeeParameters::default(), &random_seed_bytes);
 }
 },
 }
Expand Down

7 changes: 4 additions & 3 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,7 +866,7 @@ mod tests {
 fn disconnect_socket(&mut self) {}
	}

	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>>>, Arc<test_utils::TestLogger>>;
	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>, (), TestScorer>>, Arc<test_utils::TestLogger>>;

	type ChainMonitor = chainmonitor::ChainMonitor<InMemorySigner, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;

Expand DownExpand Up@@ -1000,8 +1000,9 @@ mod tests {
	}

	impl Score for TestScorer {
 type ScoreParams = ();
 fn channel_penalty_msat(
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage, _score_params: &Self::ScoreParams
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
Expand DownExpand Up@@ -1114,7 +1115,7 @@ mod tests {
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), ()));
 let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
 let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", &persist_dir, i)));
 let now = Duration::from_secs(genesis_block.header.time as u64);
Expand Down

16 changes: 9 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
use crate::ln::msgs;
use crate::ln::onion_utils;
use crate::ln::onion_utils::HTLCFailReason;
Expand DownExpand Up@@ -625,7 +625,9 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
	Arc<DefaultRouter<
 Arc<NetworkGraph<Arc<L>>>,
 Arc<L>,
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
 ProbabilisticScoringFeeParameters,
 ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>,
	>>,
	Arc<L>
>;
Expand All@@ -641,7 +643,7 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
/// of [`KeysManager`] and [`DefaultRouter`].
///
/// This is not exported to bindings users as Arcs don't make sense in bindings
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>>, &'g L>;
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, ProbabilisticScoringFeeParameters, ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, &'g L>;

/// A trivial trait which describes any [`ChannelManager`] used in testing.
#[cfg(any(test, feature = "_test_utils"))]
Expand DownExpand Up@@ -8584,7 +8586,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8618,7 +8620,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8681,7 +8683,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -8725,7 +8727,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1738,7 +1738,7 @@ pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_valu
	router::get_route(
 &send_node.node.get_our_node_id(), payment_params, &send_node.network_graph.read_only(),
 Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, send_node.logger, &scorer, &random_seed_bytes
 recv_value, send_node.logger, &scorer, &(), &random_seed_bytes
	)
}

Expand DownExpand Up@@ -2328,7 +2328,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = router::get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
 None, recv_value, origin_node.logger, &scorer, &(), &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7044,7 +7044,7 @@ fn test_check_htlc_underpaying() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
	nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7298,11 +7298,11 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);

	let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
Expand DownExpand Up@@ -9520,7 +9520,7 @@ fn test_keysend_payments_to_public_node() {
	};
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
	let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage),
Expand DownExpand Up@@ -9555,7 +9555,7 @@ fn test_keysend_payments_to_private_node() {
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
	).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -993,7 +993,7 @@ macro_rules! get_phantom_route {
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
 Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 $amt, $nodes[0].logger, &scorer, &[0u8; 32]
 $amt, $nodes[0].logger, &scorer, &(), &[0u8; 32]
 ).unwrap(), phantom_route_hint.phantom_scid)
	}
}}
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -864,7 +864,7 @@ fn get_ldk_payment_preimage() {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(),
 Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 amt_msat, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 amt_msat, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	nodes[0].node.send_payment_with_route(&route, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1418,7 +1418,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &route_params.payment_params,
 &nodes[0].network_graph.read_only(), None, route_params.final_value_msat,
 nodes[0].logger, &scorer, &random_seed_bytes,
 nodes[0].logger, &scorer, &(), &random_seed_bytes,
	).unwrap();

	let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/shutdown_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,9 +95,9 @@ fn updates_shutdown_wait() {
	let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);

	let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
 ), true, APIError::ChannelUnavailable {..}, {});
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[#2189] Score Fee Params as a passed in parameter by henghonglee · Pull Request #2237 · lightningdevkit/rust-lightning · GitHub
Skip to content
[#2189] Score Fee Params as a passed in parameter#2237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

May 11, 2023
 Merged


[#2189] Score Fee Params as a passed in parameter
#2237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21b0818

Score's FeeParams as passed-in params on Routefinding functions


henghonglee May 6, 2023
86af670

Move functions around to colocate impl of FeeParams and DecayParams


henghonglee May 10, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
use lightning::util::logger::Logger;
use lightning::util::ser::{Readable, ReadableArgs, Writeable};
use lightning::util::ser::{ReadableArgs, Writeable};
Comment thread
henghonglee marked this conversation as resolved.


use crate::utils::test_logger;
use crate::utils::test_persister::TestPersister;
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::ln::msgs;
use lightning::routing::gossip::{NetworkGraph, RoutingFees};
use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::ProbabilisticScorer;
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters};
use lightning::util::config::UserConfig;
use lightning::util::ser::Readable;

Expand DownExpand Up@@ -293,7 +293,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }]));
 }
 }
 let scorer = ProbabilisticScorer::new(Default::default(), &net_graph, &logger);
 let scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &net_graph, &logger);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let final_value_msat = slice_to_be64(get_slice!(8));
Expand All@@ -305,7 +305,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 &logger, &scorer, &random_seed_bytes);
 &logger, &scorer, &ProbabilisticScoringFeeParameters::default(), &random_seed_bytes);
 }
 },
 }
Expand Down

7 changes: 4 additions & 3 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,7 +866,7 @@ mod tests {
 fn disconnect_socket(&mut self) {}
	}

	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>>>, Arc<test_utils::TestLogger>>;
	type ChannelManager = channelmanager::ChannelManager<Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<KeysManager>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<DefaultRouter<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>, Arc<Mutex<TestScorer>>, (), TestScorer>>, Arc<test_utils::TestLogger>>;

	type ChainMonitor = chainmonitor::ChainMonitor<InMemorySigner, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;

Expand DownExpand Up@@ -1000,8 +1000,9 @@ mod tests {
	}

	impl Score for TestScorer {
 type ScoreParams = ();
 fn channel_penalty_msat(
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage, _score_params: &Self::ScoreParams
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
Expand DownExpand Up@@ -1114,7 +1115,7 @@ mod tests {
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), ()));
 let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
 let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", &persist_dir, i)));
 let now = Duration::from_secs(genesis_block.header.time as u64);
Expand Down

16 changes: 9 additions & 7 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
use crate::ln::msgs;
use crate::ln::onion_utils;
use crate::ln::onion_utils::HTLCFailReason;
Expand DownExpand Up@@ -625,7 +625,9 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
	Arc<DefaultRouter<
 Arc<NetworkGraph<Arc<L>>>,
 Arc<L>,
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>
 Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
 ProbabilisticScoringFeeParameters,
 ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>,
	>>,
	Arc<L>
>;
Expand All@@ -641,7 +643,7 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
/// of [`KeysManager`] and [`DefaultRouter`].
///
/// This is not exported to bindings users as Arcs don't make sense in bindings
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>>, &'g L>;
pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> = ChannelManager<&'a M, &'b T, &'c KeysManager, &'c KeysManager, &'c KeysManager, &'d F, &'e DefaultRouter<&'f NetworkGraph<&'g L>, &'g L, &'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, ProbabilisticScoringFeeParameters, ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>, &'g L>;

/// A trivial trait which describes any [`ChannelManager`] used in testing.
#[cfg(any(test, feature = "_test_utils"))]
Expand DownExpand Up@@ -8584,7 +8586,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8618,7 +8620,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
 None, nodes[0].logger, &scorer, &random_seed_bytes
 None, nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();
 let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
 RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
Expand DownExpand Up@@ -8681,7 +8683,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -8725,7 +8727,7 @@ mod tests {
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1738,7 +1738,7 @@ pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_valu
	router::get_route(
 &send_node.node.get_our_node_id(), payment_params, &send_node.network_graph.read_only(),
 Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, send_node.logger, &scorer, &random_seed_bytes
 recv_value, send_node.logger, &scorer, &(), &random_seed_bytes
	)
}

Expand DownExpand Up@@ -2328,7 +2328,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = router::get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
 None, recv_value, origin_node.logger, &scorer, &(), &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7044,7 +7044,7 @@ fn test_check_htlc_underpaying() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
	nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7298,11 +7298,11 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 3_000_000, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);

	let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
Expand DownExpand Up@@ -9520,7 +9520,7 @@ fn test_keysend_payments_to_public_node() {
	};
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
	let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage),
Expand DownExpand Up@@ -9555,7 +9555,7 @@ fn test_keysend_payments_to_private_node() {
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = find_route(
 &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer, &random_seed_bytes
 nodes[0].logger, &scorer, &(), &random_seed_bytes
	).unwrap();

	let test_preimage = PaymentPreimage([42; 32]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -993,7 +993,7 @@ macro_rules! get_phantom_route {
 (get_route(
 &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
 Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 $amt, $nodes[0].logger, &scorer, &[0u8; 32]
 $amt, $nodes[0].logger, &scorer, &(), &[0u8; 32]
 ).unwrap(), phantom_route_hint.phantom_scid)
	}
}}
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -864,7 +864,7 @@ fn get_ldk_payment_preimage() {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(),
 Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
 amt_msat, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
 amt_msat, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
	nodes[0].node.send_payment_with_route(&route, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
	check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -1418,7 +1418,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
	let route = get_route(
 &nodes[0].node.get_our_node_id(), &route_params.payment_params,
 &nodes[0].network_graph.read_only(), None, route_params.final_value_msat,
 nodes[0].logger, &scorer, &random_seed_bytes,
 nodes[0].logger, &scorer, &(), &random_seed_bytes,
	).unwrap();

	let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/shutdown_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,9 +95,9 @@ fn updates_shutdown_wait() {
	let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);

	let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
	let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &(), &random_seed_bytes).unwrap();
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
 ), true, APIError::ChannelUnavailable {..}, {});
Expand Down
Loading