diff --git a/cmake/modules/TestSuite.cmake b/cmake/modules/TestSuite.cmake --- a/cmake/modules/TestSuite.cmake +++ b/cmake/modules/TestSuite.cmake @@ -64,7 +64,8 @@ ${SUITE} "${_test_name}-upgrade-activated" ${NAME} -t "${_test_name}" - -- -gravitonactivationtime=1573819200 + # Dec. 1st, 2019 at 00:00:00 + -- -phononactivationtime=1575158400 ) endif() endforeach() diff --git a/contrib/teamcity/build-configurations.sh b/contrib/teamcity/build-configurations.sh --- a/contrib/teamcity/build-configurations.sh +++ b/contrib/teamcity/build-configurations.sh @@ -114,7 +114,7 @@ TEST_RUNNER_FLAGS="${TEST_RUNNER_FLAGS} --extended" fi ./test/functional/test_runner.py ${TEST_RUNNER_FLAGS} - ./test/functional/test_runner.py -J=junit_results_next_upgrade.xml --with-gravitonactivation ${TEST_RUNNER_FLAGS} + ./test/functional/test_runner.py -J=junit_results_next_upgrade.xml --with-phononactivation ${TEST_RUNNER_FLAGS} # Build secp256k1 and run the java tests. export TOPLEVEL="${TOPLEVEL}"/src/secp256k1 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 @@ -46,8 +46,8 @@ TEST_EXIT_FAILED = 1 TEST_EXIT_SKIPPED = 77 -# Timestamp is 01.01.2019 -TIMESTAMP_IN_THE_PAST = 1546300800 +# Timestamp is Dec. 1st, 2019 at 00:00:00 +TIMESTAMP_IN_THE_PAST = 1575158400 class BitcoinTestFramework(): @@ -103,8 +103,8 @@ help="Attach a python debugger if test fails") parser.add_argument("--usecli", dest="usecli", default=False, action="store_true", help="use bitcoin-cli instead of RPC for all commands") - parser.add_argument("--with-gravitonactivation", dest="gravitonactivation", default=False, action="store_true", - help="Activate graviton update on timestamp {}".format(TIMESTAMP_IN_THE_PAST)) + parser.add_argument("--with-phononactivation", dest="phononactivation", default=False, action="store_true", + help="Activate phonon update on timestamp {}".format(TIMESTAMP_IN_THE_PAST)) self.add_options(parser) self.options = parser.parse_args() @@ -294,9 +294,9 @@ extra_args=extra_args[i], use_cli=self.options.usecli, )) - if self.options.gravitonactivation: + if self.options.phononactivation: self.nodes[i].extend_default_args( - ["-gravitonactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) + ["-phononactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) def start_node(self, i, *args, **kwargs): """Start a bitcoind""" @@ -455,9 +455,9 @@ if i > 0: self.nodes[i].extend_default_args( ["-connect=127.0.0.1:" + str(p2p_port(0))]) - if self.options.gravitonactivation: + if self.options.phononactivation: self.nodes[i].extend_default_args( - ["-gravitonactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) + ["-phononactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) self.start_node(i) # Wait for RPC connections to be ready