fixup: update mnvaults for setup_masternode changes

Author: domob1812

divi/qa/rpc-tests/mnvaults.py

@@ -28,7 +28,6 @@ class MnVaultsTest (MnTestFramework):
   def __init__ (self):
     super (MnVaultsTest, self).__init__ ()
     self.base_args = ["-debug=masternode", "-debug=mocktime"]
-    self.cfg = None
     self.number_of_nodes=7
 
   def connect_to_anchors(self,nodeID):
@@ -124,9 +123,10 @@ def fund_vault (self):
     assert_equal (signed["complete"], True)
     self.unvaultTx = signed["hex"]
 
-    self.setup_masternode(2,1,"mn","copper",{"txhash":txid,"vout":vout})
-    self.setup[1].cfg.rewardAddr = self.nodes[0].getaddress ("reward")
-    self.cfg = self.setup[1].cfg
+    self.rewardAddr = self.nodes[0].getnewaddress ("reward")
+    self.setup_masternode(2, 1, "mn", "copper",
+                          utxo={"txhash":txid,"vout":vout},
+                          rewardAddr=self.rewardAddr)
     self.stop_masternode_daemons()
     self.start_masternode_daemons(updateMockTime=True)
     self.connect_masternodes_to_peers(range(3,7),updateMockTime=True)
@@ -210,7 +210,7 @@ def get_payments (self):
     winners = self.nodes[3].getmasternodewinners ()
     found = False
     for w in winners:
-      if w["winner"]["address"] == self.cfg.rewardAddr:
+      if w["winner"]["address"] == self.rewardAddr:
         found = True
         break
     assert_equal (found, True)