refactor: use nodeIdx instead of node.index with MasternodeInfo

node is self.nodes[nodeIdx], so node.index will always be nodeIdx, just
fetch nodeIdx directly instead.

Author: kwvg

test/functional/feature_llmq_data_recovery.py

@@ -33,7 +33,7 @@ def set_test_params(self):
         self.set_dash_llmq_test_params(4, 3)
 
     def restart_mn(self, mn: MasternodeInfo, reindex=False, qvvec_sync=None, qdata_recovery_enabled=True):
-        args = self.extra_args[mn.node.index] + ['-masternodeblsprivkey=%s' % mn.keyOperator,
+        args = self.extra_args[mn.nodeIdx] + ['-masternodeblsprivkey=%s' % mn.keyOperator,
                                               '-llmq-data-recovery=%d' % qdata_recovery_enabled]
         if qvvec_sync is None:
             qvvec_sync = []
@@ -42,12 +42,12 @@ def restart_mn(self, mn: MasternodeInfo, reindex=False, qvvec_sync=None, qdata_r
         if reindex:
             args.append('-reindex')
             bb_hash = mn.node.getbestblockhash()
-            self.restart_node(mn.node.index, args)
+            self.restart_node(mn.nodeIdx, args)
             self.wait_until(lambda: mn.node.getbestblockhash() == bb_hash)
         else:
-            self.restart_node(mn.node.index, args)
+            self.restart_node(mn.nodeIdx, args)
         force_finish_mnsync(mn.node)
-        self.connect_nodes(mn.node.index, 0)
+        self.connect_nodes(mn.nodeIdx, 0)
         if qdata_recovery_enabled:
             # trigger recovery threads and wait for them to start
             self.generate(self.nodes[0], 1, sync_fun=self.no_op)

test/functional/feature_llmq_signing.py

@@ -188,7 +188,7 @@ def assert_sigs_nochange(hasrecsigs, isconflicting1, isconflicting2, timeout):
             assert_sigs_nochange(False, False, False, 3)
             # Need to re-connect so that it later gets the recovered sig
             mn.node.setnetworkactive(True)
-            self.connect_nodes(mn.node.index, 0)
+            self.connect_nodes(mn.nodeIdx, 0)
             force_finish_mnsync(mn.node)
             # Make sure intra-quorum connections were also restored
             self.bump_mocktime(1)  # need this to bypass quorum connection retry timeout

test/functional/feature_llmq_simplepose.py

@@ -75,20 +75,20 @@ def isolate_mn(self, mn: MasternodeInfo):
 
     def close_mn_port(self, mn: MasternodeInfo):
         self.deaf_mns.append(mn)
-        self.stop_node(mn.node.index)
+        self.stop_node(mn.nodeIdx)
         self.start_masternode(mn, ["-listen=0", "-nobind"])
-        self.connect_nodes(mn.node.index, 0)
+        self.connect_nodes(mn.nodeIdx, 0)
         # Make sure the to-be-banned node is still connected well via outbound connections
         for mn2 in self.mninfo: # type: MasternodeInfo
             if self.deaf_mns.count(mn2) == 0:
-                self.connect_nodes(mn.node.index, mn2.node.index)
+                self.connect_nodes(mn.nodeIdx, mn2.node.index)
         self.reset_probe_timeouts()
         return False, False
 
     def force_old_mn_proto(self, mn: MasternodeInfo):
-        self.stop_node(mn.node.index)
+        self.stop_node(mn.nodeIdx)
         self.start_masternode(mn, ["-pushversion=70216"])
-        self.connect_nodes(mn.node.index, 0)
+        self.connect_nodes(mn.nodeIdx, 0)
         self.reset_probe_timeouts()
         return False, True
 
@@ -210,11 +210,11 @@ def repair_masternodes(self, restart):
                 self.nodes[0].sendtoaddress(addr, 0.1)
                 self.nodes[0].protx('update_service', mn.proTxHash, f'127.0.0.1:{mn.nodePort}', mn.keyOperator, "", addr)
                 if restart:
-                    self.stop_node(mn.node.index)
+                    self.stop_node(mn.nodeIdx)
                     self.start_masternode(mn)
                 else:
                     mn.node.setnetworkactive(True)
-                self.connect_nodes(mn.node.index, 0)
+                self.connect_nodes(mn.nodeIdx, 0)
 
         # syncing blocks only since node 0 has txes waiting to be mined
         self.sync_blocks()
@@ -230,7 +230,7 @@ def repair_masternodes(self, restart):
             self.wait_until(lambda: mn.node.getconnectioncount() == 0)
             mn.node.setnetworkactive(True)
             force_finish_mnsync(mn.node)
-            self.connect_nodes(mn.node.index, 0)
+            self.connect_nodes(mn.nodeIdx, 0)
 
     def reset_probe_timeouts(self):
         # Make sure all masternodes will reconnect/re-probe

test/functional/feature_mnehf.py

@@ -42,7 +42,7 @@ def restart_all_nodes(self, params=None):
 
         self.restart_node(0)
         for mn in self.mninfo: # type: MasternodeInfo
-            index = mn.node.index
+            index = mn.nodeIdx
             self.stop_node(index)
             self.start_masternode(mn)
         for i in range(1, self.num_nodes):

test/functional/p2p_quorum_data.py

@@ -124,12 +124,12 @@ def set_test_params(self):
         self.set_dash_test_params(4, 3, extra_args=extra_args)
 
     def restart_mn(self, mn: MasternodeInfo, reindex=False):
-        args = self.extra_args[mn.node.index] + ['-masternodeblsprivkey=%s' % mn.keyOperator]
+        args = self.extra_args[mn.nodeIdx] + ['-masternodeblsprivkey=%s' % mn.keyOperator]
         if reindex:
             args.append('-reindex')
-        self.restart_node(mn.node.index, args)
+        self.restart_node(mn.nodeIdx, args)
         force_finish_mnsync(mn.node)
-        self.connect_nodes(mn.node.index, 0)
+        self.connect_nodes(mn.nodeIdx, 0)
         self.sync_blocks()
 
     def run_test(self):