Make some tests more reliable (#537)

* Make coldstaking test more reliable

* Updated qa/rpc-tests/cfund-proposal-state-accept.py test to be more reliable

Author: mxaddict

qa/rpc-tests/cfund-proposal-state-accept.py

@@ -156,10 +156,12 @@ def run_test(self):
 
         blocks=slow_gen(self.nodes[0], 1)
 
+        # Load the expires_on value before the loop
+        expires_on = int(self.nodes[0].getproposal(proposalid0)["expiresOn"])
+
         # Wait for the proposal to expire
-        while int(self.nodes[0].getblock(blocks[0])["time"]) <= int(self.nodes[0].getproposal(proposalid0)["expiresOn"]):
-            blocks=slow_gen(self.nodes[0], 1)
-            time.sleep(1)
+        while int(self.nodes[0].getblock(blocks[0])["time"]) <= expires_on:
+            blocks=slow_gen(self.nodes[0], 1, 0.5)
 
         assert(self.nodes[0].getproposal(proposalid0)["status"] == "expired waiting for end of voting period")
 

qa/rpc-tests/coldstaking_spending.py

@@ -13,7 +13,7 @@ class ColdStakingSpending(NavCoinTestFramework):
     def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
-        self.num_nodes = 2
+        self.num_nodes = 1
     # set up nodes
     def setup_network(self, split=False):
         self.nodes = self.setup_nodes()
@@ -52,7 +52,8 @@ def run_test(self):
 
         # send funds to the cold staking address (leave some nav for fees) -- we specifically require
         # a transaction fee of minimum 0.002884 navcoin due to the complexity of this transaction
-        self.nodes[0].sendtoaddress(coldstaking_address_spending, float(self.nodes[0].getbalance()) - MIN_COLDSTAKING_SENDING_FEE)
+        tx = self.nodes[0].sendtoaddress(coldstaking_address_spending, float(self.nodes[0].getbalance()) - MIN_COLDSTAKING_SENDING_FEE)
+        fee = self.nodes[0].gettransaction(tx)['fee']
         # put transaction in new block & update blockchain
         slow_gen(self.nodes[0], 1)
         # create list for all coldstaking utxo recieved
@@ -72,7 +73,7 @@ def run_test(self):
         # difference between balance after sending and previous balance is the same when block reward is removed
         # values are converted to string and "00" is added to right of == operand because values must have equal num of
         # decimals
-        assert(str(balance_post_send_one - BLOCK_REWARD) <= (str(float(balance_before_send) - MIN_COLDSTAKING_SENDING_FEE) + "00"))
+        assert_equal(balance_post_send_one - BLOCK_REWARD, balance_before_send + fee) # FEE IS negative already so we ADD it
 
         """check staking weight now == 0 (we don't hold the staking key)"""