Merge PR 'Fix CI: pin tokio; remove 0.0.125 compat tests' (#5299)
What changed, and why it matters
This commit is purely a maintenance patch for the project's continuous integration (CI) system. It pins the tokio dependency to an older version for older Rust compilers and removes compatibility tests for a very old LDK release (0.0.125). There is no change to production code, no security fix, and no vulnerability introduced.
No security action required. This is a routine CI/test-maintenance change. Reviewers may verify that the removed 0.0.125 test coverage is acceptable given the age of that release.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit modifies CI workflow files and test infrastructure only. It adds a source ci/ci-tests-common.sh call in two workflow files so that a dependency-pinning helper runs before the tor-enabled tokio tests. It adds a tokio pin to 1.53.3 for Rust compilers below 1.85 (because tokio 1.54.0 raised its MSRV). It removes the lightning_0_0_125 dev-dependency and the associated test_125_dangling_post_update_actions upgrade/downgrade test. No library code is changed.
Changed components
.forgejo/workflows/build.yml.github/workflows/build.ymlci/ci-tests-common.shlightning-tests/Cargo.tomllightning-tests/src/upgrade_downgrade_tests.rsInspect captured patch +5 / −151
### .forgejo/workflows/build.yml
@@ -405,6 +405,7 @@ jobs:
if ! grep -q "Bootstrapped 100%" "$TOR_DATA/tor.log"; then
echo "tor failed to bootstrap within timeout:"; cat "$TOR_DATA/tor.log"; exit 1
fi
+ source ci/ci-tests-common.sh
TOR_PROXY="127.0.0.1:9050" RUSTFLAGS="--cfg=tor" cargo test --verbose --color always -p lightning-net-tokio
notify-failure:
### .github/workflows/build.yml
@@ -348,6 +348,7 @@ jobs:
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }}
- name: Test tor connections using lightning-net-tokio
run: |
+ source ci/ci-tests-common.sh
TOR_PROXY="127.0.0.1:9050" RUSTFLAGS="--cfg=tor" cargo test --verbose --color always -p lightning-net-tokio
notify-failure:
### ci/ci-tests-common.sh
@@ -9,6 +9,9 @@ RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
# which we do here.
# Further crates which appear only as dev-dependencies are pinned further down.
function PIN_RELEASE_DEPS {
+ # Starting with version 1.54.0, the `tokio` crate has an MSRV of rustc 1.85.
+ [ "$RUSTC_MINOR_VERSION" -lt 85 ] && cargo update -p tokio --precise "1.53.3" --quiet
+
return 0 # Don't fail the script if our rustc is higher than the last check
}
### lightning-tests/Cargo.toml
@@ -17,7 +17,6 @@ lightning-macros = { path = "../lightning-macros" }
lightning = { path = "../lightning", features = ["_test_utils"] }
lightning_0_2 = { package = "lightning", version = "0.2.0", features = ["_test_utils"] }
lightning_0_1 = { package = "lightning", version = "0.1.7", features = ["_test_utils"] }
-lightning_0_0_125 = { package = "lightning", version = "0.0.125", features = ["_test_utils"] }
bitcoin = { version = "0.32.2", default-features = false }
### lightning-tests/src/upgrade_downgrade_tests.rs
@@ -39,20 +39,6 @@ use lightning_0_1::ln::msgs::ChannelMessageHandler as _;
use lightning_0_1::routing::router as router_0_1;
use lightning_0_1::util::ser::Writeable as _;
-use lightning_0_0_125::chain::ChannelMonitorUpdateStatus as ChannelMonitorUpdateStatus_0_0_125;
-use lightning_0_0_125::check_added_monitors as check_added_monitors_0_0_125;
-use lightning_0_0_125::events::ClosureReason as ClosureReason_0_0_125;
-use lightning_0_0_125::expect_payment_claimed as expect_payment_claimed_0_0_125;
-use lightning_0_0_125::get_htlc_update_msgs as get_htlc_update_msgs_0_0_125;
-use lightning_0_0_125::get_monitor as get_monitor_0_0_125;
-use lightning_0_0_125::get_revoke_commit_msgs as get_revoke_commit_msgs_0_0_125;
-use lightning_0_0_125::ln::channelmanager::PaymentId as PaymentId_0_0_125;
-use lightning_0_0_125::ln::channelmanager::RecipientOnionFields as RecipientOnionFields_0_0_125;
-use lightning_0_0_125::ln::functional_test_utils as lightning_0_0_125_utils;
-use lightning_0_0_125::ln::msgs::ChannelMessageHandler as _;
-use lightning_0_0_125::routing::router as router_0_0_125;
-use lightning_0_0_125::util::ser::Writeable as _;
-
use lightning::blinded_path::message::NextMessageHop;
use lightning::chain::chaininterface::FEERATE_FLOOR_SATS_PER_KW;
use lightning::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER};
@@ -129,142 +115,6 @@ fn simple_upgrade() {
claim_payment(&nodes[0], &[&nodes[1]], preimage);
}
-#[test]
-fn test_125_dangling_post_update_actions() {
- // Tests a failure of upgrading from 0.0.125 to 0.1 when there's a dangling
- // `MonitorUpdateCompletionAction` due to the bug fixed in
- // 93b4479e472e6767af5df90fecdcdfb79074e260.
- let (node_d_ser, mon_ser);
- {
- // First, we get RAA-source monitor updates held by using async persistence (note that this
- // issue was first identified as a consequence of the bug fixed in
- // 93b4479e472e6767af5df90fecdcdfb79074e260 but in order to replicate that bug we need a
- // complicated multi-threaded race that is not deterministic, thus we "cheat" here by using
- // async persistence). We do this by simply claiming an MPP payment and not completing the
- // second channel's `ChannelMonitorUpdate`, blocking RAA `ChannelMonitorUpdate`s from the
- // first (which is ultimately a very similar bug to the one fixed in 93b4479e472e6767af5df).
- //
- // Then, we claim a second payment on the channel, which ultimately doesn't have its
- // `ChannelMonitorUpdate` completion handled due to the presence of the blocked
- // `ChannelMonitorUpdate`. The claim also generates a post-update completion action, but
- // the `ChannelMonitorUpdate` isn't queued due to the RAA-update block.
- let chanmon_cfgs = lightning_0_0_125_utils::create_chanmon_cfgs(4);
- let node_cfgs = lightning_0_0_125_utils::create_node_cfgs(4, &chanmon_cfgs);
- let node_chanmgrs =
- lightning_0_0_125_utils::create_node_chanmgrs(4, &node_cfgs, &[None, None, None, None]);
- let nodes = lightning_0_0_125_utils::create_network(4, &node_cfgs, &node_chanmgrs);
-
- let node_b_id = nodes[1].node.get_our_node_id();
- let node_d_id = nodes[3].node.get_our_node_id();
-
- lightning_0_0_125_utils::create_announced_chan_between_nodes_with_value(
- &nodes, 0, 1, 100_000, 0,
- );
- lightning_0_0_125_utils::create_announced_chan_between_nodes_with_value(
- &nodes, 0, 2, 100_000, 0,
- );
- let chan_id_1_3 = lightning_0_0_125_utils::create_announced_chan_between_nodes_with_value(
- &nodes, 1, 3, 100_000, 0,
- )
- .2;
- let chan_id_2_3 = lightning_0_0_125_utils::create_announced_chan_between_nodes_with_value(
- &nodes, 2, 3, 100_000, 0,
- )
- .2;
-
- let (preimage, hash, secret) =
- lightning_0_0_125_utils::get_payment_preimage_hash(&nodes[3], Some(15_000_000), None);
-
- let pay_params = router_0_0_125::PaymentParameters::from_node_id(
- node_d_id,
- lightning_0_0_125_utils::TEST_FINAL_CLTV,
- )
- .with_bolt11_features(nodes[3].node.bolt11_invoice_features())
- .unwrap();
-
- let route_params =
- router_0_0_125::RouteParameters::from_payment_params_and_value(pay_params, 15_000_000);
- let route = lightning_0_0_125_utils::get_route(&nodes[0], &route_params).unwrap();
-
- let onion = RecipientOnionFields_0_0_125::secret_only(secret);
- let id = PaymentId_0_0_125(hash.0);
- nodes[0].node.send_payment_with_route(route, hash, onion, id).unwrap();
-
- check_added_monitors_0_0_125!(nodes[0], 2);
- let paths = &[&[&nodes[1], &nodes[3]][..], &[&nodes[2], &nodes[3]]];
- lightning_0_0_125_utils::pass_along_route(&nodes[0], paths, 15_000_000, hash, secret);
-
- let preimage_2 = lightning_0_0_125_utils::route_payment(&nodes[1], &[&nodes[3]], 100_000).0;
-
- chanmon_cfgs[3].persister.set_update_ret(ChannelMonitorUpdateStatus_0_0_125::InProgress);
- chanmon_cfgs[3].persister.set_update_ret(ChannelMonitorUpdateStatus_0_0_125::InProgress);
- nodes[3].node.claim_funds(preimage);
- check_added_monitors_0_0_125!(nodes[3], 2);
-
- let (outpoint, update_id, _) = {
- let latest_monitors = nodes[3].chain_monitor.latest_monitor_update_id.lock().unwrap();
- latest_monitors.get(&chan_id_1_3).unwrap().clone()
- };
- nodes[3].chain_monitor.chain_monitor.channel_monitor_updated(outpoint, update_id).unwrap();
- expect_payment_claimed_0_0_125!(nodes[3], hash, 15_000_000);
-
- let ds_fulfill = get_htlc_update_msgs_0_0_125!(nodes[3], node_b_id);
- // Due to an unrelated test bug in 0.0.125, we have to leave the `ChannelMonitorUpdate` for
- // the previous node un-completed or we will panic when dropping the `Node`.
- chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus_0_0_125::InProgress);
- nodes[1].node.handle_update_fulfill_htlc(&node_d_id, &ds_fulfill.update_fulfill_htlcs[0]);
- check_added_monitors_0_0_125!(nodes[1], 1);
-
- nodes[1].node.handle_commitment_signed(&node_d_id, &ds_fulfill.commitment_signed);
- check_added_monitors_0_0_125!(nodes[1], 1);
-
- // The `ChannelMonitorUpdate` generated by the RAA from node B to node D will be blocked.
- let (bs_raa, _) = get_revoke_commit_msgs_0_0_125!(nodes[1], node_d_id);
- nodes[3].node.handle_revoke_and_ack(&node_b_id, &bs_raa);
- check_added_monitors_0_0_125!(nodes[3], 0);
-
- // Now that there is a blocked update in the B <-> D channel, we can claim the second
- // payment across it, which, while it will generate a `ChannelMonitorUpdate`, will not
- // complete its post-update actions.
- nodes[3].node.claim_funds(preimage_2);
- check_added_monitors_0_0_125!(nodes[3], 1);
-
- // Finally, we set up the failure by force-closing the channel in question, ensuring that
- // 0.1 will not create a per-peer state for node B.
- let err = "Force Closing Channel".to_owned();
- nodes[3].node.force_close_without_broadcasting_txn(&chan_id_1_3, &node_b_id, err).unwrap();
- let reason =
- ClosureReason_0_0_125::HolderForceClosed { broadcasted_latest_txn: Some(false) };
- let peers = &[node_b_id];
- lightning_0_0_125_utils::check_closed_event(&nodes[3], 1, reason, false, peers, 100_000);
- lightning_0_0_125_utils::check_closed_broadcast(&nodes[3], 1, true);
- check_added_monitors_0_0_125!(nodes[3], 1);
-
- node_d_ser = nodes[3].node.encode();
- mon_ser = get_monitor_0_0_125!(nodes[3], chan_id_2_3).encode();
- }
-
- // Create a dummy node to reload over with the 0.0.125 state
-
- let mut chanmon_cfgs = create_chanmon_cfgs(4);
-
- // Our TestChannelSigner will fail as we're jumping ahead, so disable its state-based checks
- chanmon_cfgs[0].keys_manager.disable_all_state_policy_checks = true;
- chanmon_cfgs[1].keys_manager.disable_all_state_policy_checks = true;
- chanmon_cfgs[2].keys_manager.disable_all_state_policy_checks = true;
- chanmon_cfgs[3].keys_manager.disable_all_state_policy_checks = true;
-
- let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);
- let (persister, chain_mon);
- let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, None]);
- let node;
- let mut nodes = create_network(4, &node_cfgs, &node_chanmgrs);
-
- // Finally, reload the node in the latest LDK. This previously failed.
- let config = test_default_channel_config();
- reload_node!(nodes[3], config, &node_d_ser, &[&mon_ser], persister, chain_mon, node);
-}
-
#[test]
fn test_0_1_legacy_remote_key_derivation() {
// Test that a channel opened with a v1/legacy `remote_key` derivation will be properly spentWhy this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.