Merge pull request #1434 from psgreco/elements-23.2.x-sync-1432

Sync 23.2.x with master after #1432

Author: delta1

ci/test/04_install.sh

@@ -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

test/functional/feature_elements_taproot_activation.py

@@ -49,7 +49,7 @@ def test_activation(self, rpc, activation_height):
                 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")