GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1435 from psgreco/elements-23.x-sync-1432

Browse source 
Sync 23.x with master after #1432
This commit is contained in:
Byron Hambly 2025-03-13 09:01:42 +02:00 • committed by GitHub
commit 1b7ea4cd06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ci/test/04_install.sh
View file

@ -11,7 +11,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
fi
if [ "$CI_OS_NAME" == "macos" ]; then
sudo -H pip3 install --upgrade --break-system-packages pip
sudo -H pip3 install --upgrade pip
# shellcheck disable=SC2086
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
fi

2
test/functional/feature_elements_taproot_activation.py
View file

@ -49,7 +49,7 @@ class TaprootActivationTest(BitcoinTestFramework):
assert_equal (decode["versionHex"], "20000000")
assert_equal(rpc.getdeploymentinfo()["deployments"]["taproot"]["bip9"]["status"], "defined")
# The 1023rd block does not signal, but changes status-next to "started" from "defined"
# The 1023rd block does not signal, but changes status_next to "started" from "defined"
# bitcoin PR #23508 changed bip9 status to the current block instead of the next block
blocks = self.generatetoaddress(rpc, 1, rpc.getnewaddress())
assert_equal(rpc.getdeploymentinfo()["deployments"]["taproot"]["bip9"]["status"], "defined")