Test custom reward address in mnoperation.py.

Use a custom reward address for one of the two masternodes in the
mnoperation.py regtest, verifying that this works.

Author: domob1812

divi/qa/rpc-tests/masternode.py

@@ -12,7 +12,7 @@ class MnConfigLine (object):
 
   def __init__ (self, line):
     parts = line.split (" ")
-    assert_equal (len (parts), 5)
+    assert len (parts) in [5, 6]
 
     self.line = line
 
@@ -22,6 +22,21 @@ 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

divi/qa/rpc-tests/mncollateral.py

@@ -59,6 +59,7 @@ def run_test (self):
     assert_equal (cfg.alias, "spent")
     assert_equal (cfg.ip, "1.2.3.4:51476")
     assert_equal (cfg.txid, txid)
+    assert_equal (cfg.rewardAddr, None)
     assert_equal (node.gettxout (cfg.txid, cfg.vout)["value"], 300)
 
     # It should still be possible to spend the coins, invalidating the

divi/qa/rpc-tests/mnoperation.py

@@ -69,9 +69,9 @@ def start_node (self, n):
     and masternode config for it."""
 
     configs = [
-      [c.line for c in self.cfg],
-      [self.cfg[0].line],
-      [self.cfg[1].line],
+      [c.getLine () for c in self.cfg],
+      [self.cfg[0].getLine ()],
+      [self.cfg[1].getLine ()],
     ]
 
     args = self.base_args[:]
@@ -141,6 +141,8 @@ def fund_masternodes (self):
       fund_masternode (self.nodes[0], "mn2", "silver", id2, "localhost:%d" % p2p_port (2)),
     ]
 
+    self.cfg[1].rewardAddr = self.nodes[0].getnewaddress ("reward2")
+
   def start_masternodes (self):
     print ("Starting masternodes...")
 
@@ -264,7 +266,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.nodes[2].getmasternodestatus ()["addr"]
+    addr2 = self.cfg[1].rewardAddr
     assert_equal (len (winners), 2)
     assert_greater_than (winners[addr1], 0)
     assert_greater_than (winners[addr2], 0)
@@ -309,8 +311,9 @@ def check_rewards (self):
     self.start_node (0)
     sync_blocks (self.nodes)
 
-    assert_greater_than (self.nodes[0].getbalance ("alloc->mn1"), 0)
-    assert_greater_than (self.nodes[0].getbalance ("alloc->mn2"), 0)
+    assert_greater_than (self.nodes[0].getbalance ("alloc->mn1"), 100)
+    assert_equal (self.nodes[0].getbalance ("alloc->mn2"), 300)
+    assert_greater_than (self.nodes[0].getbalance ("reward2"), 0)
 
 
 if __name__ == '__main__':