diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -272,7 +272,7 @@ # Dec. 1st, 2019 at 00:00:00 -- "-testsuitename=Bitcoin ABC unit tests with next upgrade activated" - -axionactivationtime=1575158400 + -gluonactivationtime=1644922800 ) endforeach() endfunction() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -96,14 +96,14 @@ add_functional_test_check(check-functional-upgrade-activated "functional tests with the next upgrade activated" - --with-axionactivation + --with-gluonactivation ) add_dependencies(check-upgrade-activated check-functional-upgrade-activated) add_functional_test_check(check-functional-upgrade-activated-extended "extended functional tests with the next upgrade activated" --extended - --with-axionactivation + --with-gluonactivation ) add_dependencies(check-upgrade-activated-extended check-functional-upgrade-activated-extended) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -45,8 +45,8 @@ TEST_EXIT_FAILED = 1 TEST_EXIT_SKIPPED = 77 -# Timestamp is Dec. 1st, 2019 at 00:00:00 -TIMESTAMP_IN_THE_PAST = 1575158400 +# Timestamp is Feb. 15th, 2022 at 12:00:00 +TIMESTAMP_IN_THE_PAST = 1644922800 TMPDIR_PREFIX = "bitcoin_func_test_" @@ -184,8 +184,8 @@ help="set a random seed for deterministically reproducing a previous test run") parser.add_argument("--descriptors", default=False, action="store_true", help="Run test using a descriptor wallet") - parser.add_argument("--with-axionactivation", dest="axionactivation", default=False, action="store_true", - help="Activate axion update on timestamp {}".format(TIMESTAMP_IN_THE_PAST)) + parser.add_argument("--with-gluonactivation", dest="gluonactivation", default=False, action="store_true", + help="Activate gluon update on timestamp {}".format(TIMESTAMP_IN_THE_PAST)) parser.add_argument( '--timeout-factor', dest="timeout_factor", @@ -467,9 +467,9 @@ use_valgrind=self.options.valgrind, descriptors=self.options.descriptors, )) - if self.options.axionactivation: + if self.options.gluonactivation: self.nodes[i].extend_default_args( - ["-axionactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) + ["-gluonactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) def start_node(self, i, *args, **kwargs): """Start a bitcoind""" @@ -747,9 +747,9 @@ emulator=self.options.emulator, )) - if self.options.axionactivation: + if self.options.gluonactivation: self.nodes[CACHE_NODE_ID].extend_default_args( - ["-axionactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) + ["-gluonactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) self.start_node(CACHE_NODE_ID) cache_node = self.nodes[CACHE_NODE_ID]