Skip to content

Commit a715ee3

Browse files
committed
Stop relying on *Features::known in BP and persister tests
As we move towards specify supported/required feature bits in the module(s) where they are supported, the global `known` feature set constructors no longer make sense. Here we stop relying on the `known` method in the `lightning-background-processor` and `lightning-persister` crate tests.
1 parent b039376 commit a715ee3

File tree

2 files changed

+10
-10
lines changed
  • lightning-background-processor/src
  • lightning-persister/src

2 files changed

+10
-10
lines changed

lightning-background-processor/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,8 @@ mod tests {
581581
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeysInterface, KeysManager};
582582
use lightning::chain::transaction::OutPoint;
583583
use lightning::get_event_msg;
584-
use lightning::ln::channelmanager::{BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
585-
use lightning::ln::features::{ChannelFeatures, InitFeatures};
584+
use lightning::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
585+
use lightning::ln::features::ChannelFeatures;
586586
use lightning::ln::msgs::{ChannelMessageHandler, Init};
587587
use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
588588
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
@@ -754,8 +754,8 @@ mod tests {
754754

755755
for i in 0..num_nodes {
756756
for j in (i+1)..num_nodes {
757-
nodes[i].node.peer_connected(&nodes[j].node.get_our_node_id(), &Init { features: InitFeatures::known(), remote_network_address: None });
758-
nodes[j].node.peer_connected(&nodes[i].node.get_our_node_id(), &Init { features: InitFeatures::known(), remote_network_address: None });
757+
nodes[i].node.peer_connected(&nodes[j].node.get_our_node_id(), &Init { features: channelmanager::provided_init_features(), remote_network_address: None });
758+
nodes[j].node.peer_connected(&nodes[i].node.get_our_node_id(), &Init { features: channelmanager::provided_init_features(), remote_network_address: None });
759759
}
760760
}
761761

@@ -776,8 +776,8 @@ mod tests {
776776
macro_rules! begin_open_channel {
777777
($node_a: expr, $node_b: expr, $channel_value: expr) => {{
778778
$node_a.node.create_channel($node_b.node.get_our_node_id(), $channel_value, 100, 42, None).unwrap();
779-
$node_b.node.handle_open_channel(&$node_a.node.get_our_node_id(), InitFeatures::known(), &get_event_msg!($node_a, MessageSendEvent::SendOpenChannel, $node_b.node.get_our_node_id()));
780-
$node_a.node.handle_accept_channel(&$node_b.node.get_our_node_id(), InitFeatures::known(), &get_event_msg!($node_b, MessageSendEvent::SendAcceptChannel, $node_a.node.get_our_node_id()));
779+
$node_b.node.handle_open_channel(&$node_a.node.get_our_node_id(), channelmanager::provided_init_features(), &get_event_msg!($node_a, MessageSendEvent::SendOpenChannel, $node_b.node.get_our_node_id()));
780+
$node_a.node.handle_accept_channel(&$node_b.node.get_our_node_id(), channelmanager::provided_init_features(), &get_event_msg!($node_b, MessageSendEvent::SendAcceptChannel, $node_a.node.get_our_node_id()));
781781
}}
782782
}
783783

lightning-persister/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ mod tests {
142142
use lightning::chain::chainmonitor::Persist;
143143
use lightning::chain::transaction::OutPoint;
144144
use lightning::{check_closed_broadcast, check_closed_event, check_added_monitors};
145-
use lightning::ln::features::InitFeatures;
145+
use lightning::ln::channelmanager;
146146
use lightning::ln::functional_test_utils::*;
147147
use lightning::util::events::{ClosureReason, MessageSendEventsProvider};
148148
use lightning::util::test_utils;
@@ -206,7 +206,7 @@ mod tests {
206206
}
207207

208208
// Create some initial channel and check that a channel was persisted.
209-
let _ = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
209+
let _ = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
210210
check_persisted_data!(0);
211211

212212
// Send a few payments and make sure the monitors are updated to the latest.
@@ -250,7 +250,7 @@ mod tests {
250250
let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
251251
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
252252
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
253-
let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
253+
let chan = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
254254
nodes[1].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[0].node.get_our_node_id()).unwrap();
255255
check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
256256
let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
@@ -289,7 +289,7 @@ mod tests {
289289
let mut node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
290290
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
291291
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
292-
let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
292+
let chan = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
293293
nodes[1].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[0].node.get_our_node_id()).unwrap();
294294
check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
295295
let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();

0 commit comments

Comments
 (0)