Skip to content

Commit 11c3d70

Browse files
committed
Swap UserConfig::default() for test_default_channel_config
As LDK changes, `UserConfig::default()` may imply marginally different behavior, whereas `test_default_channel_config` is intended to tweak defaults to provide a stable behavior for test contexts. This commit changes a few uses of `UserConfig::default()` to `test_default_channel_config` in cases that will fail over the coming commits due to dust changes.
1 parent 0e831b4 commit 11c3d70

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

lightning/src/ln/functional_tests.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,11 +2433,11 @@ fn channel_monitor_network_test() {
24332433
#[test]
24342434
fn test_justice_tx_htlc_timeout() {
24352435
// Test justice txn built on revoked HTLC-Timeout tx, against both sides
2436-
let mut alice_config = UserConfig::default();
2436+
let mut alice_config = test_default_channel_config();
24372437
alice_config.channel_handshake_config.announced_channel = true;
24382438
alice_config.channel_handshake_limits.force_announced_channel_preference = false;
24392439
alice_config.channel_handshake_config.our_to_self_delay = 6 * 24 * 5;
2440-
let mut bob_config = UserConfig::default();
2440+
let mut bob_config = test_default_channel_config();
24412441
bob_config.channel_handshake_config.announced_channel = true;
24422442
bob_config.channel_handshake_limits.force_announced_channel_preference = false;
24432443
bob_config.channel_handshake_config.our_to_self_delay = 6 * 24 * 3;
@@ -2496,11 +2496,11 @@ fn test_justice_tx_htlc_timeout() {
24962496
#[test]
24972497
fn test_justice_tx_htlc_success() {
24982498
// Test justice txn built on revoked HTLC-Success tx, against both sides
2499-
let mut alice_config = UserConfig::default();
2499+
let mut alice_config = test_default_channel_config();
25002500
alice_config.channel_handshake_config.announced_channel = true;
25012501
alice_config.channel_handshake_limits.force_announced_channel_preference = false;
25022502
alice_config.channel_handshake_config.our_to_self_delay = 6 * 24 * 5;
2503-
let mut bob_config = UserConfig::default();
2503+
let mut bob_config = test_default_channel_config();
25042504
bob_config.channel_handshake_config.announced_channel = true;
25052505
bob_config.channel_handshake_limits.force_announced_channel_preference = false;
25062506
bob_config.channel_handshake_config.our_to_self_delay = 6 * 24 * 3;

lightning/src/ln/monitor_tests.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureR
1818
use crate::ln::{channel, ChannelId};
1919
use crate::ln::channelmanager::{BREAKDOWN_TIMEOUT, PaymentId, RecipientOnionFields};
2020
use crate::ln::msgs::ChannelMessageHandler;
21-
use crate::util::config::UserConfig;
2221
use crate::crypto::utils::sign;
2322
use crate::util::ser::Writeable;
2423
use crate::util::scid_utils::block_from_scid;
@@ -2249,7 +2248,7 @@ fn test_yield_anchors_events() {
22492248
// emitted by LDK, such that the consumer can attach fees to the zero fee HTLC transactions.
22502249
let mut chanmon_cfgs = create_chanmon_cfgs(2);
22512250
let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2252-
let mut anchors_config = UserConfig::default();
2251+
let mut anchors_config = test_default_channel_config();
22532252
anchors_config.channel_handshake_config.announced_channel = true;
22542253
anchors_config.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = true;
22552254
anchors_config.manually_accept_inbound_channels = true;
@@ -2400,7 +2399,7 @@ fn test_anchors_aggregated_revoked_htlc_tx() {
24002399
let bob_persister;
24012400
let bob_chain_monitor;
24022401

2403-
let mut anchors_config = UserConfig::default();
2402+
let mut anchors_config = test_default_channel_config();
24042403
anchors_config.channel_handshake_config.announced_channel = true;
24052404
anchors_config.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = true;
24062405
anchors_config.manually_accept_inbound_channels = true;

lightning/src/ln/onion_route_tests.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use crate::ln::onion_utils;
2121
use crate::routing::gossip::{NetworkUpdate, RoutingFees};
2222
use crate::routing::router::{get_route, PaymentParameters, Route, RouteParameters, RouteHint, RouteHintHop};
2323
use crate::ln::features::{InitFeatures, Bolt11InvoiceFeatures};
24+
use crate::ln::functional_test_utils::test_default_channel_config;
2425
use crate::ln::msgs;
2526
use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate, OutboundTrampolinePayload};
2627
use crate::ln::wire::Encode;
@@ -328,7 +329,7 @@ fn test_onion_failure() {
328329
// to 2000, which is above the default value of 1000 set in create_node_chanmgrs.
329330
// This exposed a previous bug because we were using the wrong value all the way down in
330331
// Channel::get_counterparty_htlc_minimum_msat().
331-
let mut node_2_cfg: UserConfig = Default::default();
332+
let mut node_2_cfg: UserConfig = test_default_channel_config();
332333
node_2_cfg.channel_handshake_config.our_htlc_minimum_msat = 2000;
333334
node_2_cfg.channel_handshake_config.announced_channel = true;
334335
node_2_cfg.channel_handshake_limits.force_announced_channel_preference = false;

0 commit comments

Comments
 (0)