From bdf8b8f625030697ca58680fd0c99c3dd3bf77af Mon Sep 17 00:00:00 2001
From: Antoine Poinsot <darosior@protonmail.com>
Date: Tue, 27 Feb 2024 14:18:04 +0100
Subject: [PATCH] Rename IS_BITCOIND_25 to IS_NOT_BITCOIND_26

for f in ; do sed -i 's/IS_BITCOIND_25/IS_NOT_BITCOIND_24/g' tests/test_misc.py; done
---
 .cirrus.yml                   | 2 +-
 tests/test_framework/utils.py | 2 +-
 tests/test_misc.py            | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8954aa96..4c420593 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -51,7 +51,7 @@ task:
       echo "49df6e444515d457ea0b885d66f521f2a26ca92ccf73d5296082e633544253bf bitcoin-24.0.1-x86_64-linux-gnu.tar.gz" | sha256sum -c
       tar -xzf bitcoin-24.0.1-x86_64-linux-gnu.tar.gz
       export BITCOIND_PATH=bitcoin-24.0.1/bin/bitcoind
-      export IS_BITCOIND_25=0
+      export IS_NOT_BITCOIND_24=0
     else
       # Download the bitcoind binary
       curl -O https://bitcoincore.org/bin/bitcoin-core-26.0/bitcoin-26.0-x86_64-linux-gnu.tar.gz
diff --git a/tests/test_framework/utils.py b/tests/test_framework/utils.py
index b38a88e1..8829fd5e 100644
--- a/tests/test_framework/utils.py
+++ b/tests/test_framework/utils.py
@@ -23,7 +23,7 @@ LIANAD_PATH = os.getenv("LIANAD_PATH", DEFAULT_MS_PATH)
 DEFAULT_BITCOIND_PATH = "bitcoind"
 BITCOIND_PATH = os.getenv("BITCOIND_PATH", DEFAULT_BITCOIND_PATH)
 OLD_LIANAD_PATH = os.getenv("OLD_LIANAD_PATH", None)
-IS_BITCOIND_25 = bool(int(os.getenv("IS_BITCOIND_25", True)))
+IS_NOT_BITCOIND_24 = bool(int(os.getenv("IS_NOT_BITCOIND_24", True)))
 
 
 COIN = 10**8
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 7add9ad5..c8d4ec91 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -13,7 +13,7 @@ from test_framework.utils import (
     LIANAD_PATH,
     COIN,
     TIMEOUT,
-    IS_BITCOIND_25,
+    IS_NOT_BITCOIND_24,
 )
 
 from threading import Thread
@@ -275,7 +275,7 @@ def test_migration(lianad_multisig, bitcoind):
 
 
 @pytest.mark.skipif(
-    not IS_BITCOIND_25, reason="Need 'generateblock' with 'submit=False'"
+    not IS_NOT_BITCOIND_24, reason="Need 'generateblock' with 'submit=False'"
 )
 def test_bitcoind_submit_block(bitcoind):
     block_count = bitcoind.rpc.getblockcount()
@@ -297,7 +297,7 @@ def bitcoind_wait_new_block(bitcoind):
 
 
 @pytest.mark.skipif(
-    not IS_BITCOIND_25, reason="Need 'generateblock' with 'submit=False'"
+    not IS_NOT_BITCOIND_24, reason="Need 'generateblock' with 'submit=False'"
 )
 def test_retry_on_workqueue_exceeded(lianad, bitcoind, executor):
     """Make sure we retry requests to bitcoind if it is temporarily overloaded."""