fixup: for mnoperation.py with setupmasternode config

Author: domob1812

divi/qa/rpc-tests/masternode.py

@@ -14,7 +14,7 @@ class MnConfigLine (object):
 
   def __init__ (self, line):
     parts = line.split (" ")
-    assert len (parts) in [5, 6]
+    assert_equal(len(parts), 5)
 
     self.line = line
 
@@ -24,21 +24,6 @@ def __init__ (self, line):
     self.txid = parts[3]
     self.vout = int (parts[4])
 
-    if len (parts) >= 6:
-      self.rewardAddr = parts[5]
-    else:
-      self.rewardAddr = None
-
-  def getLine (self):
-    """Returns the config line as string, to put into masternode.conf."""
-
-    res = "%s %s %s %s %d" % (self.alias, self.ip, self.privkey,
-                              self.txid, self.vout)
-    if self.rewardAddr is not None:
-      res += " %s" % self.rewardAddr
-
-    return res
-
 
 def fund_masternode (node, alias, tier, txid, ip):
   """Calls fundmasternode with the given data and returns the
@@ -60,7 +45,7 @@ def __init__(self, setup_data,address=None):
     if address is not None:
       self.address = address
 
-def setup_masternode(mempoolSync,controlNode, hostNode,alias,tier,hostIP, utxo = None):
+def setup_masternode(mempoolSync,controlNode, hostNode,alias,tier,hostIP, utxo = None, rewardAddr=""):
   """Calls fundmasternode with the given data and returns the
   MnConfigLine instance."""
   txdata = None
@@ -77,7 +62,7 @@ def setup_masternode(mempoolSync,controlNode, hostNode,alias,tier,hostIP, utxo =
   pubkey = controlNode.validateaddress(address)["pubkey"]
   if sync_required:
     mempoolSync()
-  data = hostNode.setupmasternode(alias,txdata["txhash"],str(txdata["vout"]), pubkey, hostIP)
+  data = hostNode.setupmasternode(alias,txdata["txhash"],str(txdata["vout"]), pubkey, hostIP, rewardAddr)
   return MnSetupData (data,address)
 
 class MnTestFramework(BitcoinTestFramework):
@@ -101,12 +86,12 @@ def for_each_masternode(self, masternode_function):
 
     return result
 
-  def setup_masternode(self,controlNodeIndex, hostNodeIndex,alias,tier,utxo=None):
+  def setup_masternode(self,controlNodeIndex, hostNodeIndex,alias,tier,utxo=None, rewardAddr=""):
     def mempoolSync():
       sync_mempools (self.nodes)
     controlNode = self.nodes[controlNodeIndex]
     hostNode = self.nodes[hostNodeIndex]
-    self.setup[hostNodeIndex] = setup_masternode(mempoolSync,controlNode,hostNode,alias, tier,"localhost:%d" % p2p_port (hostNodeIndex),utxo=utxo)
+    self.setup[hostNodeIndex] = setup_masternode(mempoolSync,controlNode,hostNode,alias, tier,"localhost:%d" % p2p_port (hostNodeIndex),utxo=utxo, rewardAddr=rewardAddr)
     self.mn_control_node_indices[alias] = controlNodeIndex
     self.mn_host_node_indices[alias] = hostNodeIndex
 
@@ -201,7 +186,7 @@ def start_masternode(nodeIndex):
         args = self.args_for(nodeIndex)
         conf = self.setup[nodeIndex].cfg
         args.append ("-masternode=%s" % conf.alias)
-        self.nodes[nodeIndex] = start_node (nodeIndex, self.options.tmpdir, extra_args=args, mn_config_lines=[conf.getLine()])
+        self.nodes[nodeIndex] = start_node (nodeIndex, self.options.tmpdir, extra_args=args, mn_config_lines=[conf.line])
         if updateMockTime:
           set_node_times([self.nodes[nodeIndex]],self.time)
     self.for_each_masternode(start_masternode)

divi/qa/rpc-tests/mnoperation.py

@@ -90,9 +90,9 @@ def fund_masternodes (self):
     self.mine_blocks (25)
     assert_equal (self.nodes[0].getbalance (), 6250)
 
+    self.rewardAddr = self.nodes[0].getnewaddress ("reward2")
     self.setup_masternode(0,1,"mn1","copper")
-    self.setup_masternode(0,2,"mn2","silver")
-    self.setup[1].cfg.rewardAddr = self.nodes[0].getnewaddress ("reward2")
+    self.setup_masternode(0,2,"mn2","silver",rewardAddr=self.rewardAddr)
     self.mine_blocks (15)
     set_node_times (self.nodes, self.time)
     self.mine_blocks (1)
@@ -182,7 +182,7 @@ def payments_both_active (self):
     winners = self.verify_number_of_votes_exist_and_tally_winners(startHeight,endHeight, 2)
 
     addr1 = self.nodes[1].getmasternodestatus ()["addr"]
-    addr2 = self.setup[1].cfg.rewardAddr
+    addr2 = self.rewardAddr
     assert_equal (len (winners), 2)
     assert_greater_than (winners[addr1], 0)
     assert_greater_than (winners[addr2], 0)