Rename test default channel config

Now that anchor channels are the default,
rename `test_default_anchors_channel_config` to
`test_default_channel_config` and the
previous default to legacy.

Author: elnosh

lightning-persister/src/test_utils.rs

@@ -132,7 +132,9 @@ pub(crate) fn do_test_store<K: KVStoreSync + Sync>(store_0: &K, store_1: &K) {
 	);
 	node_cfgs[0].chain_monitor = chain_mon_0;
 	node_cfgs[1].chain_monitor = chain_mon_1;
-	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+	let legacy_cfg = test_legacy_channel_config();
+	let node_chanmgrs =
+		create_node_chanmgrs(2, &node_cfgs, &[Some(legacy_cfg.clone()), Some(legacy_cfg)]);
 	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 
 	let node_b_id = nodes[1].node.get_our_node_id();

lightning/src/chain/chainmonitor.rs

@@ -1687,7 +1687,12 @@ mod tests {
 	fn test_chainsync_triggers_distributed_monitor_persistence() {
 		let chanmon_cfgs = create_chanmon_cfgs(3);
 		let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
-		let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
+		let legacy_cfg = test_legacy_channel_config();
+		let node_chanmgrs = create_node_chanmgrs(
+			3,
+			&node_cfgs,
+			&[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)],
+		);
 		let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 
 		let node_a_id = nodes[0].node.get_our_node_id();

lightning/src/chain/channelmonitor.rs

@@ -6808,7 +6808,8 @@ mod tests {
 		// updates is handled correctly in such conditions.
 		let chanmon_cfgs = create_chanmon_cfgs(3);
 		let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
-		let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
+		let legacy_cfg = test_legacy_channel_config();
+		let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), Some(legacy_cfg)]);
 		let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 		let channel = create_announced_chan_between_nodes(&nodes, 0, 1);
 		create_announced_chan_between_nodes(&nodes, 1, 2);

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -3779,7 +3779,12 @@ fn do_test_durable_preimages_on_closed_channel(
 	let chain_mon;
 	let node_b_reload;
 
-	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
+	let legacy_cfg = test_legacy_channel_config();
+	let node_chanmgrs = create_node_chanmgrs(
+		3,
+		&node_cfgs,
+		&[Some(legacy_cfg.clone()), Some(legacy_cfg.clone()), None],
+	);
 	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 
 	let node_a_id = nodes[0].node.get_our_node_id();
@@ -3974,7 +3979,8 @@ fn do_test_reload_mon_update_completion_actions(close_during_reload: bool) {
 	let chain_mon;
 	let node_b_reload;
 
-	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
+	let legacy_cfg = test_legacy_channel_config();
+	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[Some(legacy_cfg), None, None]);
 	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 
 	let node_b_id = nodes[1].node.get_our_node_id();
@@ -4462,7 +4468,9 @@ fn test_claim_to_closed_channel_blocks_forwarded_preimage_removal() {
 	// This tests that behavior.
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
-	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
+	let legacy_cfg = test_legacy_channel_config();
+	let node_chanmgrs =
+		create_node_chanmgrs(3, &node_cfgs, &[Some(legacy_cfg.clone()), Some(legacy_cfg), None]);
 	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 
 	let node_a_id = nodes[0].node.get_our_node_id();
@@ -4543,7 +4551,8 @@ fn test_claim_to_closed_channel_blocks_claimed_event() {
 	// This tests that behavior.
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
-	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+	let legacy_cfg = test_legacy_channel_config();
+	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(legacy_cfg), None]);
 	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 
 	let node_a_id = nodes[0].node.get_our_node_id();

lightning/src/ln/channel_open_tests.rs

@@ -172,7 +172,7 @@ fn test_0conf_limiting() {
 
 #[test]
 fn test_inbound_anchors_manual_acceptance() {
-	let anchors_cfg = test_default_anchors_channel_config();
+	let anchors_cfg = test_default_channel_config();
 	do_test_manual_inbound_accept_with_override(anchors_cfg, None);
 }
 
@@ -190,7 +190,7 @@ fn test_inbound_anchors_config_overridden() {
 		update_overrides: None,
 	};
 
-	let mut anchors_cfg = test_default_anchors_channel_config();
+	let mut anchors_cfg = test_default_channel_config();
 	let accept_message = do_test_manual_inbound_accept_with_override(anchors_cfg, Some(overrides));
 	assert_eq!(accept_message.common_fields.max_htlc_value_in_flight_msat, 5_000_000);
 	assert_eq!(accept_message.common_fields.htlc_minimum_msat, 1_000);
@@ -306,9 +306,8 @@ fn test_zero_fee_commitments_downgrade_to_static_remote() {
 	// are supported (but not accepted), but not legacy anchors.
 	let mut initiator_cfg = test_default_channel_config();
 	initiator_cfg.channel_handshake_config.negotiate_anchor_zero_fee_commitments = true;
-	initiator_cfg.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = true;
 
-	let mut receiver_cfg = test_default_channel_config();
+	let mut receiver_cfg = test_legacy_channel_config();
 	receiver_cfg.channel_handshake_config.negotiate_anchor_zero_fee_commitments = true;
 
 	let start_type = ChannelTypeFeatures::anchors_zero_fee_commitments();
@@ -367,9 +366,8 @@ fn do_test_channel_type_downgrade(
 fn test_no_channel_downgrade() {
 	// Tests that the local node will not retry when a `option_static_remote` channel is
 	// rejected by a peer that advertises support for the feature.
-	let initiator_cfg = test_default_channel_config();
+	let initiator_cfg = test_legacy_channel_config();
 	let mut receiver_cfg = test_default_channel_config();
-	receiver_cfg.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = true;
 
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
@@ -459,11 +457,11 @@ fn test_channel_resumption_fail_post_funding() {
 pub fn test_insane_channel_opens() {
 	// Stand up a network of 2 nodes
 	use crate::ln::channel::TOTAL_BITCOIN_SUPPLY_SATOSHIS;
-	let mut cfg = UserConfig::default();
-	cfg.channel_handshake_limits.max_funding_satoshis = TOTAL_BITCOIN_SUPPLY_SATOSHIS + 1;
+	let mut legacy_cfg = test_legacy_channel_config();
+	legacy_cfg.channel_handshake_limits.max_funding_satoshis = TOTAL_BITCOIN_SUPPLY_SATOSHIS + 1;
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
-	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, Some(cfg.clone())]);
+	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, Some(legacy_cfg.clone())]);
 	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 
 	let node_a_id = nodes[0].node.get_our_node_id();
@@ -473,7 +471,7 @@ pub fn test_insane_channel_opens() {
 	// funding satoshis
 	let channel_value_sat = 31337; // same as funding satoshis
 	let channel_reserve_satoshis =
-		get_holder_selected_channel_reserve_satoshis(channel_value_sat, &cfg);
+		get_holder_selected_channel_reserve_satoshis(channel_value_sat, &legacy_cfg);
 	let push_msat = (channel_value_sat - channel_reserve_satoshis) * 1000;
 
 	// Have node0 initiate a channel to node1 with aforementioned parameters

lightning/src/ln/channelmanager.rs

@@ -20398,7 +20398,7 @@ mod tests {
 	fn test_trigger_lnd_force_close() {
 		let chanmon_cfg = create_chanmon_cfgs(2);
 		let node_cfg = create_node_cfgs(2, &chanmon_cfg);
-		let user_config = test_default_channel_config();
+		let user_config = test_legacy_channel_config();
 		let node_chanmgr = create_node_chanmgrs(2, &node_cfg, &[Some(user_config.clone()), Some(user_config)]);
 		let nodes = create_network(2, &node_cfg, &node_chanmgr);
 		let message = "Channel force-closed".to_owned();

lightning/src/ln/functional_test_utils.rs

@@ -4532,7 +4532,7 @@ pub fn create_node_cfgs_with_node_id_message_router<'a>(
 	)
 }
 
-pub fn test_default_channel_config() -> UserConfig {
+pub fn test_legacy_channel_config() -> UserConfig {
 	let mut default_config = UserConfig::default();
 	default_config.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = false;
 	// Set cltv_expiry_delta slightly lower to keep the final CLTV values inside one byte in our
@@ -4552,8 +4552,8 @@ pub fn test_default_channel_config() -> UserConfig {
 	default_config
 }
 
-pub fn test_default_anchors_channel_config() -> UserConfig {
-	let mut config = test_default_channel_config();
+pub fn test_default_channel_config() -> UserConfig {
+	let mut config = test_legacy_channel_config();
 	config.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = true;
 	config
 }