Merge branch 'fix_check_upgrade_activated_upgrade11' into 'master'

Fix/update ninja target `check-upgrade-activated` See merge request bitcoin-cash-node/bitcoin-cash-node!1895
be-cash · Nov 21, 2024 · dea3fb7 · dea3fb7
2 parents 2f1e43f + 0c2bc76
commit dea3fb7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -102,15 +102,15 @@ set(TEST_SUITE_NAME_UPGRADE_ACTIVATED "Bitcoin Cash Node functional tests with t
 
 add_functional_test_check(check-functional-upgrade-activated
   "Run the functional tests with the upgrade activated"
-  --with-upgrade10activation
+  --with-upgrade11activation
   -n "${TEST_SUITE_NAME_UPGRADE_ACTIVATED}"
 )
 add_dependencies(check-upgrade-activated check-functional-upgrade-activated)
 
 add_functional_test_check(check-functional-upgrade-activated-extended
   "Run the extended functional tests with the upgrade activated"
   --extended
-  --with-upgrade10activation
+  --with-upgrade11activation
   -n "${TEST_SUITE_NAME_UPGRADE_ACTIVATED}"
 )
 add_dependencies(check-upgrade-activated-extended check-functional-upgrade-activated-extended)
@@ -125,7 +125,7 @@ add_functional_test_check(check-functional-longeronly
 
 add_functional_test_check(check-functional-upgrade-activated-longeronly
   "Run the long-runtime functional tests only with the upgrade activated"
-  --with-upgrade10activation
+  --with-upgrade11activation
     --startfrom=${DEFAULT_EXTENDED_CUTOFF}
 )
 

diff --git a/test/functional/abc-wallet-standardness.py b/test/functional/abc-wallet-standardness.py
@@ -37,7 +37,10 @@ class WalletStandardnessTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 2
-        self.extra_args = [['-acceptnonstdtxn=0'], ['-acceptnonstdtxn=1']]
+        # We must ensure upgrade11 is not activated because it affects standardness and error messaging and this test
+        # has not been yet updated to test pre and post upgrade11.
+        no_upgrade11 = "-upgrade11activationtime=9999999999"
+        self.extra_args = [[no_upgrade11, '-acceptnonstdtxn=0'], [no_upgrade11, '-acceptnonstdtxn=1']]
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()

diff --git a/test/functional/feature_int64_cscriptnum.py b/test/functional/feature_int64_cscriptnum.py
@@ -66,7 +66,8 @@ def set_test_params(self):
         self.block_heights = {}
         self.extra_args = [
             # Node0 has bigint64 activated (activates at upgrade8)
-            ["-acceptnonstdtxn=1", "-expire=0"],
+            # It must also have upgrade11 disabled (ints past 64-bits must be disabled for these tests)
+            ["-acceptnonstdtxn=1", "-expire=0", "-upgrade11activationtime=9999999999"],
         ]
 
     def bootstrap_p2p(self, *, num_connections=1):