Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: do not use extra_args for enforced DashTestFramework arguments #6283

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+8 −11
Open

fix: do not use extra_args for enforced DashTestFramework arguments #6283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a161ab
refactor: make dash specific args `sporkkey` and `dip3params` resilie…
knst Sep 16, 2024
8b3c83e
refactor: simplify extra arguments wallet_mnemonicbits.py since usehd…
knst Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/functional/rpc_net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def test_addpeeraddress(self):
by first testing adding a tried table entry before testing adding a new table one.
"""
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]

self.log.debug("Test that addpeerinfo is a hidden RPC")
Expand Down
6 changes: 2 additions & 4 deletions test/functional/test_framework/test_framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ def setup(self):
self.options.bitcoind = os.getenv("BITCOIND", default=fname_bitcoind)
self.options.bitcoincli = os.getenv("BITCOINCLI", default=fname_bitcoincli)

self.extra_args_from_options = self.options.dashd_extra_args
self.extra_args_from_options += self.options.dashd_extra_args

os.environ['PATH'] = os.pathsep.join([
os.path.join(config['environment']['BUILDDIR'], 'src'),
Expand Down Expand Up @@ -1119,9 +1119,7 @@ def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, evo
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[0] += ["-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"]
for i in range(0, num_nodes):
self.extra_args[i].append("-dip3params=2:2")
self.extra_args_from_options += ["-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK", "-dip3params=2:2"]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

6a161ab: sporkkey should be set on node0 only. Also, we probably should be using dash.conf for options that are meant to be persistent, pls check 3237354.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why exactly sporkkey can't be specified for all nodes? It's out of scope for all tests except "feature_sporks.py" to care about sporks functionally

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can do that. But you shouldn't :D


# LLMQ default test params (no need to pass -llmqtestparams)
self.llmq_size = 3
Expand Down