Skip to content

Commit

Permalink
Merge dashpay#6481: test: actually use masternode with basic bls pubk…
Browse files Browse the repository at this point in the history
…ey in mnauth test

ec00c37 test: fix off-by-one in dynamically_add_masternode (UdjinM6)
6519856 test: don't add legacy bls mn on start (UdjinM6)
3db20e3 test: actually use masternode with basic bls pubkey in mnauth test (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  `rpc_manuth` is failing in ~50% cases locally because we still use legacy pubkeys (not in 100% cases because sometimes they look like basic ones). In CI it fails too but we retry failed tests a few times so it's less noticeable. Example of "unlucky" tests: https://gitlab.com/dashpay/dash/-/jobs/8613271300#L1867.

  dashpay#6467 follow-up

  ## What was done?
  Add another masternode after v19 activaition to actually use basic bls pubkey

  ## How Has This Been Tested?
  run tests

  ## Breaking Changes
  n/a

  ## Checklist:
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    utACK ec00c37
  PastaPastaPasta:
    utACK ec00c37

Tree-SHA512: 850a02ea1bd943762cdb0be706f3703742944c294ee9603b1f9ab95a6b10fb827bc9376e03333177d956b2c13df7384cfe0eb2ffef4d05ff3ec239caa8318d24
  • Loading branch information
PastaPastaPasta committed Dec 14, 2024
2 parents c35cf1c + ec00c37 commit f656c51
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion test/functional/rpc_mnauth.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@

class FakeMNAUTHTest(DashTestFramework):
def set_test_params(self):
self.set_dash_test_params(2, 1)
self.set_dash_test_params(1, 0)

def run_test(self):
self.activate_v19(expected_activation_height=900)
self.dynamically_add_masternode()

masternode = self.mninfo[0]
masternode.node.add_p2p_connection(P2PInterface())
Expand Down
2 changes: 1 addition & 1 deletion test/functional/test_framework/test_framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ def dynamically_add_masternode(self, evo=False, rnd=None, should_be_rejected=Fal
return

self.dynamically_initialize_datadir(node_p2p_port, node_rpc_port)
node_info = self.add_dynamically_node(self.extra_args[1])
node_info = self.add_dynamically_node(self.extra_args[0])

args = ['-masternodeblsprivkey=%s' % created_mn_info.keyOperator] + node_info.extra_args
self.start_node(mn_idx, args)
Expand Down

0 comments on commit f656c51

Please sign in to comment.