Merge pull request #4038 from TheBlueMatt/2025-08-change-config

Allow changing ChannelManager::default_configuration at runtime

Author: tnull

fuzz/src/chanmon_consistency.rs

@@ -771,7 +771,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 			router: &router,
 			message_router: &router,
 			logger,
-			default_config: config,
+			config,
 			channel_monitors: monitor_refs,
 		};
 

lightning/src/ln/channelmanager.rs

@@ -62,7 +62,7 @@ fn do_test_v2_channel_establishment(session: V2ChannelEstablishmentTestSession)
 		funding_satoshis,
 		initiator_funding_inputs.clone(),
 		42, /* user_channel_id */
-		nodes[0].node.get_current_default_configuration(),
+		&nodes[0].node.get_current_config(),
 		nodes[0].best_block_info().1,
 		nodes[0].node.create_and_insert_outbound_scid_alias_for_test(),
 		ConfirmationTarget::NonAnchorChannelFee,

lightning/src/ln/dual_funding_tests.rs

@@ -866,7 +866,7 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 				)>::read(
 					&mut io::Cursor::new(w.0),
 					ChannelManagerReadArgs {
-						default_config: self.node.get_current_default_configuration().clone(),
+						config: self.node.get_current_config(),
 						entropy_source: self.keys_manager,
 						node_signer: self.keys_manager,
 						signer_provider: self.keys_manager,
@@ -1279,7 +1279,7 @@ fn check_claimed_htlcs_match_route<'a, 'b, 'c>(
 }
 
 pub fn _reload_node<'a, 'b, 'c>(
-	node: &'a Node<'a, 'b, 'c>, default_config: UserConfig, chanman_encoded: &[u8],
+	node: &'a Node<'a, 'b, 'c>, config: UserConfig, chanman_encoded: &[u8],
 	monitors_encoded: &[&[u8]],
 ) -> TestChannelManager<'b, 'c> {
 	let mut monitors_read = Vec::with_capacity(monitors_encoded.len());
@@ -1303,7 +1303,7 @@ pub fn _reload_node<'a, 'b, 'c>(
 		<(BlockHash, TestChannelManager<'b, 'c>)>::read(
 			&mut node_read,
 			ChannelManagerReadArgs {
-				default_config,
+				config,
 				entropy_source: node.keys_manager,
 				node_signer: node.keys_manager,
 				signer_provider: node.keys_manager,
@@ -1651,7 +1651,7 @@ pub fn exchange_open_accept_chan<'a, 'b, 'c>(
 		42
 	);
 	node_b.node.handle_open_channel(node_a_id, &open_channel_msg);
-	if node_b.node.get_current_default_configuration().manually_accept_inbound_channels {
+	if node_b.node.get_current_config().manually_accept_inbound_channels {
 		let events = node_b.node.get_and_clear_pending_events();
 		assert_eq!(events.len(), 1);
 		match &events[0] {
@@ -1830,7 +1830,7 @@ pub fn create_unannounced_chan_between_nodes_with_value<'a, 'b, 'c, 'd>(
 	let node_a_id = nodes[a].node.get_our_node_id();
 	let node_b_id = nodes[b].node.get_our_node_id();
 
-	let mut no_announce_cfg = nodes[a].node.get_current_default_configuration().clone();
+	let mut no_announce_cfg = nodes[a].node.get_current_config();
 	no_announce_cfg.channel_handshake_config.announce_for_forwarding = false;
 	nodes[a]
 		.node

lightning/src/ln/functional_test_utils.rs

@@ -1776,7 +1776,7 @@ fn do_test_onion_failure_stale_channel_update(announce_for_forwarding: bool) {
 		let chan_2_monitor_serialized = get_monitor!(nodes[1], channel_to_update.0).encode();
 		reload_node!(
 			nodes[1],
-			nodes[1].node.get_current_default_configuration().clone(),
+			nodes[1].node.get_current_config(),
 			&nodes[1].node.encode(),
 			&[&chan_1_monitor_serialized, &chan_2_monitor_serialized],
 			persister,

lightning/src/ln/onion_route_tests.rs

@@ -426,7 +426,7 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
 	let mut nodes_0_read = &nodes_0_serialized[..];
 	if let Err(msgs::DecodeError::DangerousValue) =
 		<(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestMessageRouter, &test_utils::TestLogger>)>::read(&mut nodes_0_read, ChannelManagerReadArgs {
-		default_config: UserConfig::default(),
+		config: UserConfig::default(),
 		entropy_source: keys_manager,
 		node_signer: keys_manager,
 		signer_provider: keys_manager,
@@ -444,7 +444,7 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
 	let mut nodes_0_read = &nodes_0_serialized[..];
 	let (_, nodes_0_deserialized_tmp) =
 		<(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestMessageRouter, &test_utils::TestLogger>)>::read(&mut nodes_0_read, ChannelManagerReadArgs {
-		default_config: UserConfig::default(),
+		config: UserConfig::default(),
 		entropy_source: keys_manager,
 		node_signer: keys_manager,
 		signer_provider: keys_manager,

lightning/src/ln/reload_tests.rs

@@ -323,7 +323,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
 		let nodes_0_serialized = nodes[0].node.encode();
 		let chan_0_monitor_serialized = get_monitor!(nodes[0], chan.2).encode();
 
-		reload_node!(nodes[0], nodes[0].node.get_current_default_configuration().clone(), &nodes_0_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);
+		reload_node!(nodes[0], nodes[0].node.get_current_config(), &nodes_0_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);
 	}
 
 	if reorg_after_reload {