improve

Author: xdustinface

.github/workflows/build-and-test.yml

@@ -34,27 +34,20 @@ jobs:
           shared-key: "test-${{ inputs.os }}-${{ matrix.group }}"
       - run: pip install pyyaml
 
-      # SPV integration tests: set up dashd on ubuntu-latest (x86_64), skip elsewhere
+      # SPV integration tests: set up dashd and test data on all platforms
       - name: Cache dashd and test data
-        if: matrix.group == 'spv' && inputs.os == 'ubuntu-latest'
+        if: matrix.group == 'spv'
         uses: actions/cache@v4
         with:
           path: .rust-dashcore-test
-          key: rust-dashcore-test-${{ env.DASHVERSION }}-${{ env.TEST_DATA_VERSION }}
+          key: rust-dashcore-test-${{ inputs.os }}-${{ env.DASHVERSION }}-${{ env.TEST_DATA_VERSION }}
 
       - name: Setup dashd for integration tests
-        if: matrix.group == 'spv' && inputs.os == 'ubuntu-latest'
+        if: matrix.group == 'spv'
         env:
           CACHE_DIR: ${{ github.workspace }}/.rust-dashcore-test
-        run: |
-          chmod +x ./contrib/setup-dashd.sh
-          source ./contrib/setup-dashd.sh
-          echo "DASHD_PATH=$DASHD_PATH" >> "$GITHUB_ENV"
-          echo "DASHD_DATADIR=$DASHD_DATADIR" >> "$GITHUB_ENV"
-
-      - name: Skip dashd integration tests
-        if: matrix.group == 'spv' && inputs.os != 'ubuntu-latest'
-        run: echo "SKIP_DASHD_TESTS=1" >> "$GITHUB_ENV"
+        shell: bash
+        run: python contrib/setup-dashd.py >> "$GITHUB_ENV"
 
       - name: Run tests
         run: python .github/scripts/ci_config.py run-group ${{ matrix.group }} --os ${{ inputs.os }}

contrib/__pycache__/setup-dashd.cpython-314.pyc

@@ -0,0 +1,137 @@
+#!/usr/bin/env python3
+"""Cross-platform setup script for dashd and test blockchain data.
+
+Downloads the Dash Core binary and regtest test data for integration tests.
+Outputs DASHD_PATH and DASHD_DATADIR lines suitable for appending to GITHUB_ENV
+or evaluating in a shell.
+
+Environment variables:
+    DASHVERSION        - Dash Core version (default: 23.0.2)
+    TEST_DATA_VERSION  - Test data release version (default: v0.0.2)
+    TEST_DATA_REPO     - GitHub repo for test data (default: dashpay/regtest-blockchain)
+    CACHE_DIR          - Cache directory (default: ~/.rust-dashcore-test)
+"""
+
+import os
+import platform
+import sys
+import tarfile
+import urllib.request
+import zipfile
+
+DASHVERSION = os.environ.get("DASHVERSION", "23.0.2")
+TEST_DATA_VERSION = os.environ.get("TEST_DATA_VERSION", "v0.0.2")
+TEST_DATA_REPO = os.environ.get("TEST_DATA_REPO", "dashpay/regtest-blockchain")
+
+
+def get_cache_dir():
+    if "CACHE_DIR" in os.environ:
+        return os.environ["CACHE_DIR"]
+    home = os.environ.get("HOME") or os.environ.get("USERPROFILE")
+    if not home:
+        sys.exit("Cannot determine home directory: neither HOME nor USERPROFILE is set")
+    return os.path.join(home, ".rust-dashcore-test")
+
+
+def get_asset_info():
+    """Return (asset_filename, binary_relative_path) for the current platform."""
+    system = platform.system()
+    machine = platform.machine()
+
+    if system == "Linux":
+        arch = "aarch64" if machine in ("aarch64", "arm64") else "x86_64"
+        asset = f"dashcore-{DASHVERSION}-{arch}-linux-gnu.tar.gz"
+    elif system == "Darwin":
+        arch = "arm64" if machine == "arm64" else "x86_64"
+        asset = f"dashcore-{DASHVERSION}-{arch}-apple-darwin.tar.gz"
+    elif system == "Windows":
+        asset = f"dashcore-{DASHVERSION}-win64.zip"
+    else:
+        sys.exit(f"Unsupported platform: {system}")
+
+    return asset
+
+
+def log(msg):
+    print(msg, file=sys.stderr)
+
+
+def download(url, dest):
+    log(f"Downloading {url} ...")
+    urllib.request.urlretrieve(url, dest)
+
+
+def extract(archive_path, dest_dir):
+    if archive_path.endswith(".zip"):
+        with zipfile.ZipFile(archive_path, "r") as zf:
+            zf.extractall(dest_dir)
+    else:
+        with tarfile.open(archive_path, "r:gz") as tf:
+            tf.extractall(dest_dir)
+
+
+def setup_dashd(cache_dir):
+    """Download and extract dashd binary. Returns the path to the dashd binary."""
+    asset = get_asset_info()
+    dashd_dir = os.path.join(cache_dir, f"dashcore-{DASHVERSION}")
+
+    ext = ".exe" if platform.system() == "Windows" else ""
+    dashd_bin = os.path.join(dashd_dir, "bin", f"dashd{ext}")
+
+    if os.path.isfile(dashd_bin):
+        log(f"dashd {DASHVERSION} already available")
+        return dashd_bin
+
+    log(f"Downloading dashd {DASHVERSION}...")
+    archive_path = os.path.join(cache_dir, asset)
+    url = f"https://github.com/dashpay/dash/releases/download/v{DASHVERSION}/{asset}"
+    download(url, archive_path)
+    extract(archive_path, cache_dir)
+    os.remove(archive_path)
+    log(f"Downloaded dashd to {dashd_dir}")
+
+    if not os.path.isfile(dashd_bin):
+        sys.exit(f"Expected binary not found after extraction: {dashd_bin}")
+
+    return dashd_bin
+
+
+def setup_test_data(cache_dir):
+    """Download and extract test blockchain data. Returns the datadir path."""
+    test_data_dir = os.path.join(
+        cache_dir, f"regtest-blockchain-{TEST_DATA_VERSION}", "regtest-40000"
+    )
+    blocks_dir = os.path.join(test_data_dir, "regtest", "blocks")
+
+    if os.path.isdir(blocks_dir):
+        log(f"Test blockchain data {TEST_DATA_VERSION} already available")
+        return test_data_dir
+
+    log(f"Downloading test blockchain data {TEST_DATA_VERSION}...")
+    parent_dir = os.path.join(cache_dir, f"regtest-blockchain-{TEST_DATA_VERSION}")
+    os.makedirs(parent_dir, exist_ok=True)
+
+    archive_path = os.path.join(cache_dir, "regtest-40000.tar.gz")
+    url = f"https://github.com/{TEST_DATA_REPO}/releases/download/{TEST_DATA_VERSION}/regtest-40000.tar.gz"
+    download(url, archive_path)
+    extract(archive_path, parent_dir)
+    os.remove(archive_path)
+    log(f"Downloaded test data to {test_data_dir}")
+
+    return test_data_dir
+
+
+def main():
+    cache_dir = get_cache_dir()
+    os.makedirs(cache_dir, exist_ok=True)
+
+    dashd_path = setup_dashd(cache_dir)
+    datadir = setup_test_data(cache_dir)
+
+    # Output lines for GITHUB_ENV or shell eval
+    print(f"DASHD_PATH={dashd_path}")
+    print(f"DASHD_DATADIR={datadir}")
+
+
+if __name__ == "__main__":
+    main()