Drop electrsd's auto-download feature for good

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
         if: "matrix.platform == 'ubuntu-latest'"
         run: |
           sudo apt-get -y install shellcheck
-          shellcheck ci/ci-tests.sh
+          shellcheck ci/*.sh -aP ci
       - name: Set RUSTFLAGS to deny warnings
         if: "matrix.toolchain == '1.63.0'"
         run: echo "RUSTFLAGS=-D warnings" >> "$GITHUB_ENV"

ci/check-compiles.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 set -x
-echo Testing $(git log -1 --oneline)
+echo "Testing $(git log -1 --oneline)"
 cargo check
 cargo doc
 cargo doc --document-private-items

ci/check-each-commit.sh

@@ -12,4 +12,4 @@ if [ "$(git log --pretty="%H %D" | grep "^[0-9a-f]*.* $1")" = "" ]; then
 	echo "It seems like the current checked-out commit is not based on $1"
 	exit 1
 fi
-git rebase --exec ci/check-compiles.sh $1
+git rebase --exec ci/check-compiles.sh "$1"

ci/ci-tests.sh

@@ -3,6 +3,7 @@ set -eox pipefail
 
 RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
 HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
+SELF_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
 # Some crates require pinning to meet our MSRV even for our downstream users,
 # which we do here.
@@ -11,50 +12,6 @@ function PIN_RELEASE_DEPS {
 	return 0 # Don't fail the script if our rustc is higher than the last check
 }
 
-# The tests of `lightning-transaction-sync` require `electrs` and `bitcoind`
-# binaries. Here, we download the binaries, validate them, and export their
-# location via `ELECTRS_EXE`/`BITCOIND_EXE` which will be used by the
-# `electrsd`/`bitcoind` crates in our tests.
-function DOWNLOAD_ELECTRS_AND_BITCOIND {
-	ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
-	ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
-	BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
-	BITCOIND_VERSION="25.1"
-	if [[ "$HOST_PLATFORM" == *linux* ]]; then
-		ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
-		ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
-		BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
-		BITCOIND_DL_HASH="a978c407b497a727f0444156e397b50491ce862d1f906fef9b521415b3611c8b"
-	elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
-		ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
-		ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
-		BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
-		BITCOIND_DL_HASH="1acfde0ec3128381b83e3e5f54d1c7907871d324549129592144dd12a821eff1"
-	else
-		echo -e "\n\nUnsupported platform. Exiting.."
-		exit 1
-	fi
-
-	DL_TMP_DIR=$(mktemp -d)
-	trap 'rm -rf -- "$DL_TMP_DIR"' EXIT
-
-	pushd "$DL_TMP_DIR"
-	ELECTRS_DL_URL="$ELECTRS_DL_ENDPOINT"/"$ELECTRS_DL_FILE_NAME"
-	curl -L -o "$ELECTRS_DL_FILE_NAME" "$ELECTRS_DL_URL"
-	echo "$ELECTRS_DL_HASH  $ELECTRS_DL_FILE_NAME"|shasum -a 256 -c
-	unzip "$ELECTRS_DL_FILE_NAME"
-	export ELECTRS_EXE="$DL_TMP_DIR"/electrs
-	chmod +x "$ELECTRS_EXE"
-
-	BITCOIND_DL_URL="$BITCOIND_DL_ENDPOINT"/bitcoin-core-"$BITCOIND_VERSION"/"$BITCOIND_DL_FILE_NAME"
-	curl -L -o "$BITCOIND_DL_FILE_NAME" "$BITCOIND_DL_URL"
-	echo "$BITCOIND_DL_HASH  $BITCOIND_DL_FILE_NAME"|shasum -a 256 -c
-	tar xzf "$BITCOIND_DL_FILE_NAME"
-	export BITCOIND_EXE="$DL_TMP_DIR"/bitcoin-"$BITCOIND_VERSION"/bin/bitcoind
-	chmod +x "$BITCOIND_EXE"
-	popd
-}
-
 PIN_RELEASE_DEPS # pin the release dependencies in our main workspace
 
 # Starting with version 1.10.0, the `regex` crate has an MSRV of rustc 1.65.0.
@@ -68,9 +25,6 @@ PIN_RELEASE_DEPS # pin the release dependencies in our main workspace
 
 export RUST_BACKTRACE=1
 
-# Build `lightning-transaction-sync` in no_download mode.
-export RUSTFLAGS="$RUSTFLAGS --cfg no_download"
-
 echo -e "\n\nBuilding and testing all workspace crates..."
 cargo test --verbose --color always
 cargo check --verbose --color always
@@ -91,7 +45,7 @@ if [[ "$HOST_PLATFORM" != *windows* ]]; then
 	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
 	pushd lightning-transaction-sync
 
-	DOWNLOAD_ELECTRS_AND_BITCOIND
+	source "$SELF_DIR/download_bitcoind_electrs.sh"
 
 	cargo test --verbose --color always --features esplora-blocking
 	cargo check --verbose --color always --features esplora-blocking

ci/download_bitcoind_electrs.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+set -eox pipefail
+
+# The tests of `lightning-transaction-sync` require `electrs` and `bitcoind`
+# binaries. Here, we download the binaries, validate them, and export their
+# location via `ELECTRS_EXE`/`BITCOIND_EXE` which will be used by the
+# `electrsd`/`bitcoind` crates in our tests.
+
+HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
+ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
+ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
+BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
+BITCOIND_VERSION="25.1"
+if [[ "$HOST_PLATFORM" == *linux* ]]; then
+	ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
+	ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
+	BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
+	BITCOIND_DL_HASH="a978c407b497a727f0444156e397b50491ce862d1f906fef9b521415b3611c8b"
+elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
+	ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
+	ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
+	BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
+	BITCOIND_DL_HASH="1acfde0ec3128381b83e3e5f54d1c7907871d324549129592144dd12a821eff1"
+else
+	printf "\n\n"
+	echo "Unsupported platform: $HOST_PLATFORM Exiting.."
+	exit 1
+fi
+
+DL_TMP_DIR=$(mktemp -d)
+trap 'rm -rf -- "$DL_TMP_DIR"' EXIT
+
+pushd "$DL_TMP_DIR"
+ELECTRS_DL_URL="$ELECTRS_DL_ENDPOINT"/"$ELECTRS_DL_FILE_NAME"
+curl -L -o "$ELECTRS_DL_FILE_NAME" "$ELECTRS_DL_URL"
+echo "$ELECTRS_DL_HASH  $ELECTRS_DL_FILE_NAME"|shasum -a 256 -c
+unzip "$ELECTRS_DL_FILE_NAME"
+export ELECTRS_EXE="$DL_TMP_DIR"/electrs
+chmod +x "$ELECTRS_EXE"
+
+BITCOIND_DL_URL="$BITCOIND_DL_ENDPOINT"/bitcoin-core-"$BITCOIND_VERSION"/"$BITCOIND_DL_FILE_NAME"
+curl -L -o "$BITCOIND_DL_FILE_NAME" "$BITCOIND_DL_URL"
+echo "$BITCOIND_DL_HASH  $BITCOIND_DL_FILE_NAME"|shasum -a 256 -c
+tar xzf "$BITCOIND_DL_FILE_NAME"
+export BITCOIND_EXE="$DL_TMP_DIR"/bitcoin-"$BITCOIND_VERSION"/bin/bitcoind
+chmod +x "$BITCOIND_EXE"
+popd

ci/rustfmt.sh

@@ -6,8 +6,8 @@ set -eox pipefail
 
 # Run fmt
 TMP_FILE=$(mktemp)
-find . -name '*.rs' -type f |sort >$TMP_FILE
-for file in $(comm -23 $TMP_FILE rustfmt_excluded_files); do
+find . -name '*.rs' -type f |sort >"$TMP_FILE"
+for file in $(comm -23 "$TMP_FILE" rustfmt_excluded_files); do
 	echo "Checking formatting of $file"
-	rustfmt +1.63.0 --check $file
+	rustfmt +1.63.0 --check "$file"
 done

lightning-transaction-sync/Cargo.toml

@@ -34,8 +34,5 @@ electrum-client = { version = "0.18.0", optional = true }
 lightning = { version = "0.0.123-beta", path = "../lightning", default-features = false, features = ["std", "_test_utils"] }
 tokio = { version = "1.35.0", features = ["full"] }
 
-[target.'cfg(all(not(target_os = "windows"), not(no_download)))'.dev-dependencies]
-electrsd = { version = "0.26.0", default-features = false, features = ["legacy", "esplora_a33e97e1", "bitcoind_25_0"] }
-
-[target.'cfg(all(not(target_os = "windows"), no_download))'.dev-dependencies]
+[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
 electrsd = { version = "0.26.0", default-features = false, features = ["legacy"] }