Browse Source

Support Bitcoin Core v26 for tests

master
Kristaps Kaupe 2 years ago
parent
commit
8684853117
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 2
      .github/workflows/unittests.yml
  2. 10
      test/run_tests.sh

2
.github/workflows/unittests.yml

@ -10,7 +10,7 @@ jobs:
matrix: matrix:
os: [macos-latest, ubuntu-latest] os: [macos-latest, ubuntu-latest]
python-version: ["3.7", "3.11"] python-version: ["3.7", "3.11"]
bitcoind-version: ["0.18.0", "25.1"] bitcoind-version: ["0.18.0", "26.0"]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

10
test/run_tests.sh

@ -204,6 +204,16 @@ run_jm_tests ()
if [[ -z "$btcconf" ]]; then if [[ -z "$btcconf" ]]; then
btcconf="${jm_test_datadir}/bitcoin.conf" btcconf="${jm_test_datadir}/bitcoin.conf"
cp -f ./test/bitcoin.conf "${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 fi
${orig_umask} ${orig_umask}
echo "datadir=${jm_test_datadir}" >> "${jm_test_datadir}/bitcoin.conf" echo "datadir=${jm_test_datadir}" >> "${jm_test_datadir}/bitcoin.conf"

Loading…
Cancel
Save