Skip to content

Commit 3b3713f

Browse files
TheBlueMattTheBlueMatt
committed
Stop relying on the *Features::known method in functional tests
This diff is commit, like the last, stops relying on the `known` feature set constructor, doing so entirely with import changes and sed rules.
1 parent 1a32737 commit 3b3713f

File tree

8 files changed

+476
-481
lines changed

8 files changed

+476
-481
lines changed

‎lightning/src/ln/chanmon_update_fail_tests.rs

Lines changed: 59 additions & 60 deletions
Large diffs are not rendered by default.

‎lightning/src/ln/functional_tests.rs

Lines changed: 248 additions & 248 deletions
Large diffs are not rendered by default.

‎lightning/src/ln/monitor_tests.rs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ use chain::channelmonitor::{ANTI_REORG_DELAY, Balance};
1313
use chain::transaction::OutPoint;
1414
use chain::chaininterface::LowerBoundedFeeEstimator;
1515
use ln::channel;
16-
use ln::channelmanager::BREAKDOWN_TIMEOUT;
17-
use ln::features::InitFeatures;
16+
use ln::channelmanager::{self, BREAKDOWN_TIMEOUT};
1817
use ln::msgs::ChannelMessageHandler;
1918
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
2019

@@ -49,8 +48,8 @@ fn chanmon_fail_from_stale_commitment() {
4948
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
5049
let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
5150

52-
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
53-
let (update_a, _, chan_id_2, _) = create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
51+
create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
52+
let (update_a, _, chan_id_2, _) = create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features());
5453

5554
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], 1_000_000);
5655
nodes[0].node.send_payment(&route, payment_hash, &Some(payment_secret)).unwrap();
@@ -106,7 +105,7 @@ fn revoked_output_htlc_resolution_timing() {
106105
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
107106
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
108107

109-
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 500_000_000, InitFeatures::known(), InitFeatures::known());
108+
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 500_000_000, channelmanager::provided_init_features(), channelmanager::provided_init_features());
110109

111110
let payment_hash_1 = route_payment(&nodes[1], &[&nodes[0]], 1_000_000).1;
112111

@@ -156,7 +155,7 @@ fn chanmon_claim_value_coop_close() {
156155
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
157156

158157
let (_, _, chan_id, funding_tx) =
159-
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 1_000_000, InitFeatures::known(), InitFeatures::known());
158+
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 1_000_000, channelmanager::provided_init_features(), channelmanager::provided_init_features());
160159
let funding_outpoint = OutPoint { txid: funding_tx.txid(), index: 0 };
161160
assert_eq!(funding_outpoint.to_channel_id(), chan_id);
162161

@@ -172,9 +171,9 @@ fn chanmon_claim_value_coop_close() {
172171

173172
nodes[0].node.close_channel(&chan_id, &nodes[1].node.get_our_node_id()).unwrap();
174173
let node_0_shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id());
175-
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
174+
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &channelmanager::provided_init_features(), &node_0_shutdown);
176175
let node_1_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
177-
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_1_shutdown);
176+
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &channelmanager::provided_init_features(), &node_1_shutdown);
178177

179178
let node_0_closing_signed = get_event_msg!(nodes[0], MessageSendEvent::SendClosingSigned, nodes[1].node.get_our_node_id());
180179
nodes[1].node.handle_closing_signed(&nodes[0].node.get_our_node_id(), &node_0_closing_signed);
@@ -257,7 +256,7 @@ fn do_test_claim_value_force_close(prev_commitment_tx: bool) {
257256
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
258257

259258
let (_, _, chan_id, funding_tx) =
260-
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 1_000_000, InitFeatures::known(), InitFeatures::known());
259+
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 1_000_000, channelmanager::provided_init_features(), channelmanager::provided_init_features());
261260
let funding_outpoint = OutPoint { txid: funding_tx.txid(), index: 0 };
262261
assert_eq!(funding_outpoint.to_channel_id(), chan_id);
263262

@@ -594,7 +593,7 @@ fn test_balances_on_local_commitment_htlcs() {
594593

595594
// Create a single channel with two pending HTLCs from nodes[0] to nodes[1], one which nodes[1]
596595
// knows the preimage for, one which it does not.
597-
let (_, _, chan_id, funding_tx) = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0, InitFeatures::known(), InitFeatures::known());
596+
let (_, _, chan_id, funding_tx) = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 0, channelmanager::provided_init_features(), channelmanager::provided_init_features());
598597
let funding_outpoint = OutPoint { txid: funding_tx.txid(), index: 0 };
599598

600599
let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 10_000_000);
@@ -762,7 +761,7 @@ fn test_no_preimage_inbound_htlc_balances() {
762761
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
763762
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
764763

765-
let (_, _, chan_id, funding_tx) = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 500_000_000, InitFeatures::known(), InitFeatures::known());
764+
let (_, _, chan_id, funding_tx) = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 500_000_000, channelmanager::provided_init_features(), channelmanager::provided_init_features());
766765
let funding_outpoint = OutPoint { txid: funding_tx.txid(), index: 0 };
767766

768767
// Send two HTLCs, one from A to B, and one from B to A.
@@ -1007,7 +1006,7 @@ fn do_test_revoked_counterparty_commitment_balances(confirm_htlc_spend_first: bo
10071006
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
10081007

10091008
let (_, _, chan_id, funding_tx) =
1010-
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 100_000_000, InitFeatures::known(), InitFeatures::known());
1009+
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 100_000_000, channelmanager::provided_init_features(), channelmanager::provided_init_features());
10111010
let funding_outpoint = OutPoint { txid: funding_tx.txid(), index: 0 };
10121011
assert_eq!(funding_outpoint.to_channel_id(), chan_id);
10131012

@@ -1251,7 +1250,7 @@ fn test_revoked_counterparty_htlc_tx_balances() {
12511250

12521251
// Create some initial channels
12531252
let (_, _, chan_id, funding_tx) =
1254-
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 11_000_000, InitFeatures::known(), InitFeatures::known());
1253+
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 11_000_000, channelmanager::provided_init_features(), channelmanager::provided_init_features());
12551254
let funding_outpoint = OutPoint { txid: funding_tx.txid(), index: 0 };
12561255
assert_eq!(funding_outpoint.to_channel_id(), chan_id);
12571256

@@ -1455,7 +1454,7 @@ fn test_revoked_counterparty_aggregated_claims() {
14551454
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
14561455

14571456
let (_, _, chan_id, funding_tx) =
1458-
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 100_000_000, InitFeatures::known(), InitFeatures::known());
1457+
create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1_000_000, 100_000_000, channelmanager::provided_init_features(), channelmanager::provided_init_features());
14591458
let funding_outpoint = OutPoint { txid: funding_tx.txid(), index: 0 };
14601459
assert_eq!(funding_outpoint.to_channel_id(), chan_id);
14611460

‎lightning/src/ln/onion_route_tests.rs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use chain::channelmonitor::{ChannelMonitor, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PER
1515
use chain::keysinterface::{KeysInterface, Recipient};
1616
use ln::{PaymentHash, PaymentSecret};
1717
use ln::channel::EXPIRE_PREV_CONFIG_TICKS;
18-
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, HTLCForwardInfo, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingHTLCInfo, PendingHTLCRouting};
18+
use ln::channelmanager::{self, ChannelManager, ChannelManagerReadArgs, HTLCForwardInfo, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingHTLCInfo, PendingHTLCRouting};
1919
use ln::onion_utils;
2020
use routing::gossip::{NetworkUpdate, RoutingFees, NodeId};
2121
use routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
@@ -270,7 +270,7 @@ fn test_fee_failures() {
270270
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
271271
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[Some(config), Some(config), Some(config)]);
272272
let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
273-
let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()), create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known())];
273+
let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()), create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features())];
274274

275275
// positive case
276276
let (route, payment_hash_success, payment_preimage_success, payment_secret_success) = get_route_and_payment_hash!(nodes[0], nodes[2], 40_000);
@@ -322,7 +322,7 @@ fn test_onion_failure() {
322322
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
323323
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[Some(config), Some(config), Some(node_2_cfg)]);
324324
let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
325-
let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()), create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known())];
325+
let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()), create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features())];
326326
for node in nodes.iter() {
327327
*node.keys_manager.override_random_bytes.lock().unwrap() = Some([3; 32]);
328328
}
@@ -607,16 +607,16 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
607607
let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
608608

609609
let other_channel = create_chan_between_nodes(
610-
&nodes[0], &nodes[1], InitFeatures::known(), InitFeatures::known(),
610+
&nodes[0], &nodes[1], channelmanager::provided_init_features(), channelmanager::provided_init_features(),
611611
);
612612
let channel_to_update = if announced_channel {
613613
let channel = create_announced_chan_between_nodes(
614-
&nodes, 1, 2, InitFeatures::known(), InitFeatures::known(),
614+
&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features(),
615615
);
616616
(channel.2, channel.0.contents.short_channel_id)
617617
} else {
618618
let channel = create_unannounced_chan_between_nodes_with_value(
619-
&nodes, 1, 2, 100000, 10001, InitFeatures::known(), InitFeatures::known(),
619+
&nodes, 1, 2, 100000, 10001, channelmanager::provided_init_features(), channelmanager::provided_init_features(),
620620
);
621621
(channel.0.channel_id, channel.0.short_channel_id_alias.unwrap())
622622
};
@@ -641,7 +641,7 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
641641
htlc_minimum_msat: None,
642642
}])];
643643
let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty)
644-
.with_features(InvoiceFeatures::known())
644+
.with_features(channelmanager::provided_invoice_features())
645645
.with_route_hints(hop_hints);
646646
get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT, TEST_FINAL_CLTV)
647647
};
@@ -802,10 +802,10 @@ fn test_default_to_onion_payload_tlv_format() {
802802
let node_chanmgrs = create_node_chanmgrs(5, &node_cfgs, &[None, None, None, None, Some(priv_channels_conf)]);
803803
let mut nodes = create_network(5, &node_cfgs, &node_chanmgrs);
804804

805-
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
806-
create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
807-
create_announced_chan_between_nodes(&nodes, 2, 3, InitFeatures::known(), InitFeatures::known());
808-
create_unannounced_chan_between_nodes_with_value(&nodes, 3, 4, 100000, 10001, InitFeatures::known(), InitFeatures::known());
805+
create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
806+
create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features());
807+
create_announced_chan_between_nodes(&nodes, 2, 3, channelmanager::provided_init_features(), channelmanager::provided_init_features());
808+
create_unannounced_chan_between_nodes_with_value(&nodes, 3, 4, 100000, 10001, channelmanager::provided_init_features(), channelmanager::provided_init_features());
809809

810810
let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id());
811811
let origin_node = &nodes[0];
@@ -830,7 +830,7 @@ fn test_default_to_onion_payload_tlv_format() {
830830
// supports variable length onions, as the `InitFeatures` exchanged in the init message
831831
// between the nodes will be used when creating the route. We therefore do not default to
832832
// supporting variable length onions for that hop, as the `InitFeatures` in this case are
833-
// `InitFeatures::known()`.
833+
// `channelmanager::provided_init_features()`.
834834

835835
let unannounced_chan = &nodes[4].node.list_usable_channels()[0];
836836

@@ -897,9 +897,9 @@ fn test_do_not_default_to_onion_payload_tlv_format_when_unsupported() {
897897
let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, None]);
898898
let mut nodes = create_network(4, &node_cfgs, &node_chanmgrs);
899899

900-
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
901-
create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
902-
create_announced_chan_between_nodes(&nodes, 2, 3, InitFeatures::known(), InitFeatures::known());
900+
create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
901+
create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features());
902+
create_announced_chan_between_nodes(&nodes, 2, 3, channelmanager::provided_init_features(), channelmanager::provided_init_features());
903903

904904
let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id())
905905
.with_features(InvoiceFeatures::empty());
@@ -961,7 +961,7 @@ macro_rules! get_phantom_route {
961961
let phantom_pubkey = PublicKey::from_secret_key(&secp_ctx, &phantom_secret);
962962
let phantom_route_hint = $nodes[1].node.get_phantom_route_hints();
963963
let payment_params = PaymentParameters::from_node_id(phantom_pubkey)
964-
.with_features(InvoiceFeatures::known())
964+
.with_features(channelmanager::provided_invoice_features())
965965
.with_route_hints(vec![RouteHint(vec![
966966
RouteHintHop {
967967
src_node_id: $nodes[0].node.get_our_node_id(),
@@ -1003,7 +1003,7 @@ fn test_phantom_onion_hmac_failure() {
10031003
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
10041004
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
10051005

1006-
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1006+
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
10071007

10081008
// Get the route.
10091009
let recv_value_msat = 10_000;
@@ -1062,7 +1062,7 @@ fn test_phantom_invalid_onion_payload() {
10621062
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
10631063
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
10641064

1065-
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1065+
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
10661066

10671067
// Get the route.
10681068
let recv_value_msat = 10_000;
@@ -1135,7 +1135,7 @@ fn test_phantom_final_incorrect_cltv_expiry() {
11351135
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
11361136
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
11371137

1138-
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1138+
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
11391139

11401140
// Get the route.
11411141
let recv_value_msat = 10_000;
@@ -1191,7 +1191,7 @@ fn test_phantom_failure_too_low_cltv() {
11911191
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
11921192
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
11931193

1194-
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1194+
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
11951195

11961196
// Get the route.
11971197
let recv_value_msat = 10_000;
@@ -1236,7 +1236,7 @@ fn test_phantom_failure_too_low_recv_amt() {
12361236
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
12371237
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
12381238

1239-
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1239+
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
12401240

12411241
// Get the route with a too-low amount.
12421242
let recv_amt_msat = 10_000;
@@ -1290,7 +1290,7 @@ fn test_phantom_dust_exposure_failure() {
12901290
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, Some(receiver_config)]);
12911291
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
12921292

1293-
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1293+
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
12941294

12951295
// Get the route with an amount exceeding the dust exposure threshold of nodes[1].
12961296
let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[1], Some(max_dust_exposure + 1));
@@ -1332,7 +1332,7 @@ fn test_phantom_failure_reject_payment() {
13321332
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
13331333
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
13341334

1335-
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1335+
let channel = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
13361336

13371337
// Get the route with a too-low amount.
13381338
let recv_amt_msat = 10_000;

0 commit comments

Comments
 (0)