Move keysend tests to payment_tests.rs

[rust-lightning] / ci / ci-tests.sh

diff --git a/ci/ci-tests.sh b/ci/ci-tests.sh
index 35acd6bad168bafa124cf3d5ccdb5b621a734b7e..5b46b2da079fef898391362ff026f159c60624d8 100755 (executable)
--- a/ci/ci-tests.sh
+++ b/ci/ci-tests.sh
@@ -29,6 +29,9 @@ PIN_RELEASE_DEPS # pin the release dependencies in our main workspace
 # The quote crate switched to Rust edition 2021 starting with v1.0.31, i.e., has MSRV of 1.56
 [ "$RUSTC_MINOR_VERSION" -lt 56 ] && cargo update -p quote --precise "1.0.30" --verbose
 
+# The proc-macro2 crate switched to Rust edition 2021 starting with v1.0.66, i.e., has MSRV of 1.56
+[ "$RUSTC_MINOR_VERSION" -lt 56 ] && cargo update -p proc-macro2 --precise "1.0.65" --verbose
+
 [ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code"
 
 export RUST_BACKTRACE=1
@@ -37,13 +40,42 @@ echo -e "\n\nBuilding and testing all workspace crates..."
 cargo build --verbose --color always
 cargo test --verbose --color always
 
-echo -e "\n\nBuilding with all Log-Limiting features"
-pushd lightning
-grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
-       cargo build --verbose --color always --features "$FEATURE"
-done
+echo -e "\n\nBuilding and testing Block Sync Clients with features"
+pushd lightning-block-sync
+cargo build --verbose --color always --features rest-client
+cargo test --verbose --color always --features rest-client
+cargo build --verbose --color always --features rpc-client
+cargo test --verbose --color always --features rpc-client
+cargo build --verbose --color always --features rpc-client,rest-client
+cargo test --verbose --color always --features rpc-client,rest-client
+cargo build --verbose --color always --features rpc-client,rest-client,tokio
+cargo test --verbose --color always --features rpc-client,rest-client,tokio
+popd
+
+if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
+       echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
+       pushd lightning-transaction-sync
+       cargo build --verbose --color always --features esplora-blocking
+       cargo test --verbose --color always --features esplora-blocking
+       cargo build --verbose --color always --features esplora-async
+       cargo test --verbose --color always --features esplora-async
+       cargo build --verbose --color always --features esplora-async-https
+       cargo test --verbose --color always --features esplora-async-https
+       popd
+fi
+
+echo -e "\n\nTest futures builds"
+pushd lightning-background-processor
+cargo test --verbose --color always --features futures
 popd
 
+if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
+       echo -e "\n\nTest Custom Message Macros"
+       pushd lightning-custom-message
+       cargo test --verbose --color always
+       popd
+fi
+
 if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
        echo -e "\n\nTest backtrace-debug builds"
        pushd lightning
@@ -51,6 +83,13 @@ if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to c
        popd
 fi
 
+echo -e "\n\nBuilding with all Log-Limiting features"
+pushd lightning
+grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
+       cargo build --verbose --color always --features "$FEATURE"
+done
+popd
+
 echo -e "\n\nTesting no-std flags in various combinations"
 for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
        pushd $DIR
@@ -74,7 +113,12 @@ popd
 echo -e "\n\nTesting no-std build on a downstream no-std crate"
 # check no-std compatibility across dependencies
 pushd no-std-check
-cargo check --verbose --color always --features lightning-transaction-sync
+if [[ $RUSTC_MINOR_VERSION -gt 67 ]]; then
+       # lightning-transaction-sync's MSRV is 1.67
+       cargo check --verbose --color always --features lightning-transaction-sync
+else
+       cargo check --verbose --color always
+fi
 popd
 
 # Test that we can build downstream code with only the "release pins".
@@ -89,42 +133,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
        popd
 fi
 
-echo -e "\n\nBuilding and testing Block Sync Clients with features"
-pushd lightning-block-sync
-cargo build --verbose --color always --features rest-client
-cargo test --verbose --color always --features rest-client
-cargo build --verbose --color always --features rpc-client
-cargo test --verbose --color always --features rpc-client
-cargo build --verbose --color always --features rpc-client,rest-client
-cargo test --verbose --color always --features rpc-client,rest-client
-cargo build --verbose --color always --features rpc-client,rest-client,tokio
-cargo test --verbose --color always --features rpc-client,rest-client,tokio
-popd
-
-if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
-       echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
-       pushd lightning-transaction-sync
-       cargo build --verbose --color always --features esplora-blocking
-       cargo test --verbose --color always --features esplora-blocking
-       cargo build --verbose --color always --features esplora-async
-       cargo test --verbose --color always --features esplora-async
-       cargo build --verbose --color always --features esplora-async-https
-       cargo test --verbose --color always --features esplora-async-https
-       popd
-fi
-
-echo -e "\n\nTest futures builds"
-pushd lightning-background-processor
-cargo test --verbose --color always --features futures
-popd
-
-if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
-       echo -e "\n\nTest Custom Message Macros"
-       pushd lightning-custom-message
-       cargo test --verbose --color always
-       popd
-fi
-
 echo -e "\n\nTest Taproot builds"
 pushd lightning
 RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning