diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py index 7b15476ea2..39dc2e2bff 100755 --- a/test/functional/mempool_persist.py +++ b/test/functional/mempool_persist.py @@ -67,7 +67,7 @@ class MempoolPersistTest(BitcoinTestFramework): self.nodes = [] self.nodes.append(start_node(0, self.options.tmpdir)) self.nodes.append(start_node(1, self.options.tmpdir)) - # Give bitcoind a second to reload the mempool + # Give dashd a second to reload the mempool time.sleep(1) assert wait_until(lambda: len(self.nodes[0].getrawmempool()) == 5) assert_equal(len(self.nodes[1].getrawmempool()), 0) @@ -76,7 +76,7 @@ class MempoolPersistTest(BitcoinTestFramework): stop_nodes(self.nodes) self.nodes = [] self.nodes.append(start_node(0, self.options.tmpdir, ["-persistmempool=0"])) - # Give bitcoind a second to reload the mempool + # Give dashd a second to reload the mempool time.sleep(1) assert_equal(len(self.nodes[0].getrawmempool()), 0) diff --git a/test/functional/sporks.py b/test/functional/sporks.py index d46b17ed9c..65783a4e88 100755 --- a/test/functional/sporks.py +++ b/test/functional/sporks.py @@ -16,6 +16,7 @@ class SporkTest(BitcoinTestFramework): super().__init__() self.num_nodes = 3 self.setup_clean_chain = True + self.extra_args = [["-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"], [], []] def setup_network(self): disable_mocktime() diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 0fe0cc93fb..4767984af3 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -303,9 +303,10 @@ class BitcoinTestFramework(object): shutil.rmtree(os.path.join(cachedir, "node" + str(i))) # Create cache directories, run dashds: + set_genesis_mocktime() for i in range(MAX_NODES): datadir = initialize_datadir(cachedir, i) - args = [os.getenv("DASHD", "dashd"), "-server", "-keypool=1", "-datadir=" + datadir, "-discover=0"] + args = [os.getenv("DASHD", "dashd"), "-server", "-keypool=1", "-datadir=" + datadir, "-discover=0", "-mocktime="+str(GENESISTIME)] if i > 0: args.append("-connect=127.0.0.1:" + str(p2p_port(0))) bitcoind_processes[i] = subprocess.Popen(args) @@ -328,14 +329,13 @@ class BitcoinTestFramework(object): # # blocks are created with timestamps 10 minutes apart # starting from 2010 minutes in the past - enable_mocktime() - block_time = get_mocktime() - (201 * 10 * 60) + block_time = GENESISTIME for i in range(2): for peer in range(4): for j in range(25): set_node_times(self.nodes, block_time) self.nodes[peer].generate(1) - block_time += 10 * 60 + block_time += 156 # Must sync before next peer starts generating blocks sync_blocks(self.nodes) @@ -353,7 +353,7 @@ class BitcoinTestFramework(object): from_dir = os.path.join(cachedir, "node" + str(i)) to_dir = os.path.join(test_dir, "node" + str(i)) shutil.copytree(from_dir, to_dir) - initialize_datadir(test_dir, i) # Overwrite port/rpcport in bitcoin.conf + initialize_datadir(test_dir, i) # Overwrite port/rpcport in dsah.conf def _initialize_chain_clean(self, test_dir, num_nodes): """Initialize empty blockchain for use by the test. diff --git a/test/functional/wallet-accounts.py b/test/functional/wallet-accounts.py index 50f852b2f2..a0058bad4e 100755 --- a/test/functional/wallet-accounts.py +++ b/test/functional/wallet-accounts.py @@ -54,7 +54,7 @@ class WalletAccountsTest(BitcoinTestFramework): # send 500 from each address to a third address not in this wallet # There's some fee that will come back to us when the miner reward # matures. - common_address = "msf4WtN1YQKXvNtvdFYt9JBnUD2FB41kjr" + common_address = "yd5KMREs3GLMe6mTJYr3YrH1juwNwrFCfB" txid = node.sendmany( fromaccount="", amounts={common_address: 100}, diff --git a/test/functional/wallet-hd.py b/test/functional/wallet-hd.py index 6d0955e560..4b9cf6d3a7 100755 --- a/test/functional/wallet-hd.py +++ b/test/functional/wallet-hd.py @@ -82,7 +82,7 @@ class WalletHDTest(BitcoinTestFramework): # Needs rescan self.stop_node(1) - self.nodes[1] = start_node(1, self.options.tmpdir, self.extra_args[1] + ['-rescan']) + self.nodes[1] = start_node(1, self.options.tmpdir, self.extra_args[1] + ['-rescan'], redirect_stderr=True) #connect_nodes_bi(self.nodes, 0, 1) assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1)