diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index ee45284..60ba312 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -10,7 +10,7 @@ jobs: matrix: os: [macos-latest, ubuntu-latest] python-version: ["3.7", "3.11"] - bitcoind-version: ["0.18.0", "25.1"] + bitcoind-version: ["0.18.0", "26.0"] steps: - uses: actions/checkout@v3 diff --git a/test/run_tests.sh b/test/run_tests.sh index eda9f67..4b91e25 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -204,6 +204,16 @@ run_jm_tests () if [[ -z "$btcconf" ]]; then btcconf="${jm_test_datadir}/bitcoin.conf" cp -f ./test/bitcoin.conf "${jm_test_datadir}/bitcoin.conf" + # Temporary hack until we support descriptor wallets. + # https://github.com/JoinMarket-Org/joinmarket-clientserver/issues/1571 + if [[ -n $btcroot ]]; then + bitcoind="$btcroot/bitcoind" + else + bitcoind="bitcoind" + fi + if [[ "$($bitcoind -version | grep -Eo 'v[0-9]+')" == "v26" ]]; then + echo "deprecatedrpc=create_bdb" >> "${jm_test_datadir}/bitcoin.conf" + fi fi ${orig_umask} echo "datadir=${jm_test_datadir}" >> "${jm_test_datadir}/bitcoin.conf"