sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: make dash specific args sporkkey and dip3params resilient for dashd restart

Browse Source 
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
This commit is contained in:
Konstantin Akimov 2024-09-17 01:17:32 +07:00
parent 7eaa0cf9ca
commit 6d4a782756
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/rpc_net.py
View File

@ -311,7 +311,7 @@ class NetTest(DashTestFramework):
by first testing adding a tried table entry before testing adding a new table one. by first testing adding a tried table entry before testing adding a new table one.
""" """
self.log.info("Test addpeeraddress") self.log.info("Test addpeeraddress")
self.restart_node(1, self.extra_args[1] + ["-checkaddrman=1"]) self.restart_node(1, ["-checkaddrman=1"])
node = self.nodes[1] node = self.nodes[1]
self.log.debug("Test that addpeerinfo is a hidden RPC") self.log.debug("Test that addpeerinfo is a hidden RPC")

14
test/functional/test_framework/test_framework.py
View File

@ -43,6 +43,7 @@ from .test_node import TestNode
from .util import ( from .util import (
PortSeed, PortSeed,
MAX_NODES, MAX_NODES,
append_config,
assert_equal, assert_equal,
check_json_precision, check_json_precision,
copy_datadir, copy_datadir,
@ -635,6 +636,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
f.write("upnp=0\n") f.write("upnp=0\n")
f.write("natpmp=0\n") f.write("natpmp=0\n")
f.write("shrinkdebugfile=0\n") f.write("shrinkdebugfile=0\n")
f.write("dip3params=2:2\n")
os.makedirs(os.path.join(new_data_dir, 'stderr'), exist_ok=True) os.makedirs(os.path.join(new_data_dir, 'stderr'), exist_ok=True)
os.makedirs(os.path.join(new_data_dir, 'stdout'), exist_ok=True) os.makedirs(os.path.join(new_data_dir, 'stdout'), exist_ok=True)
@ -1099,6 +1101,15 @@ class DashTestFramework(BitcoinTestFramework):
"""Tests must override this method to define test logic""" """Tests must override this method to define test logic"""
raise NotImplementedError raise NotImplementedError
def add_nodes(self, num_nodes: int, extra_args=None, *, rpchost=None, binary=None, binary_cli=None, versions=None):
old_num_nodes = len(self.nodes)
super().add_nodes(num_nodes, extra_args, rpchost=rpchost, binary=binary, binary_cli=binary_cli, versions=versions)
for i in range(old_num_nodes, old_num_nodes + num_nodes):
append_config(self.nodes[i].datadir, ["dip3params=2:2"])
if old_num_nodes == 0:
# controller node is the only node that has an extra option allowing it to submit sporks
append_config(self.nodes[0].datadir, ["sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"])
def connect_nodes(self, a, b): def connect_nodes(self, a, b):
for mn2 in self.mninfo: for mn2 in self.mninfo:
if mn2.node is not None: if mn2.node is not None:
@ -1119,9 +1130,6 @@ class DashTestFramework(BitcoinTestFramework):
extra_args = [[]] * num_nodes extra_args = [[]] * num_nodes
assert_equal(len(extra_args), num_nodes) assert_equal(len(extra_args), num_nodes)
self.extra_args = [copy.deepcopy(a) for a in extra_args] self.extra_args = [copy.deepcopy(a) for a in extra_args]
self.extra_args[0] += ["-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"]
for i in range(0, num_nodes):
self.extra_args[i].append("-dip3params=2:2")
# LLMQ default test params (no need to pass -llmqtestparams) # LLMQ default test params (no need to pass -llmqtestparams)
self.llmq_size = 3 self.llmq_size = 3