Merge pull request #405 from djksa/fixed-rpc-tests

Fixed rpc tests

Author: marcus290

qa/pull-tester/rpc-tests.py

@@ -105,35 +105,37 @@
 # 'p2p-fullblocktest.py',
 #    'walletbackup.py',
 #    'bip68-112-113-p2p.py',
-#    'wallet.py',
-#    'wallet-hd.py',
+
+     'wallet.py',
+    'wallet-hd.py',
+
 #    'listtransactions.py',
-#    'receivedby.py',
+     'receivedby.py',
 #    'mempool_resurrect_test.py',
 #    'txn_doublespend.py --mineblock',
 #    'txn_clone.py',
-#    'getchaintips.py',
-#    'rawtransactions.py',
-#    'rest.py',
-#    'mempool_spendcoinbase.py',
+     'getchaintips.py',
+    'rawtransactions.py',
+     'rest.py',
+     'mempool_spendcoinbase.py',
 #    'mempool_reorg.py',
 #    'mempool_limit.py',
-#    'httpbasics.py',
-#    'multi_rpc.py',
-#    'zapwallettxes.py',
+     'httpbasics.py',
+     'multi_rpc.py',
+     'zapwallettxes.py',
 #    'proxy_test.py',
-#    'merkle_blocks.py',
+    'merkle_blocks.py',
 #    'fundrawtransaction.py',
 #    'signrawtransactions.py',
-#    'nodehandling.py',
-#    'reindex.py',
+     'nodehandling.py',
+     'reindex.py',
 #    'addressindex.py',
-#    'timestampindex.py',
+    'timestampindex.py',
 #    'spentindex.py',
 #    'txindex.py',
 #    'decodescript.py',
 #    'blockchain.py',
-#    'disablewallet.py',
+     'disablewallet.py',
 #    'sendheaders.py',
 #    'keypool.py',
 #    'prioritise_transaction.py',
@@ -143,8 +145,8 @@
 #    'p2p-versionbits-warning.py',
 #    'p2p-segwit.py',
 #    'segwit.py',
-#    'importprunedfunds.py',
-#    'signmessages.py',
+     'importprunedfunds.py',
+     'signmessages.py',
     'cfund-donate.py',
     'cfund-listproposals.py',
     'cfund-paymentrequest-extract-funds.py',
@@ -167,6 +169,9 @@
     'staticr-staking-amount.py',
     'hardfork-451.py',
     'staticr-tx-send.py',
+
+    'sendtoaddress.py',
+    'stakeimmaturebalance.py',
     'rpc-help.py', 
 ]
 #if ENABLE_ZMQ:

qa/rpc-tests/getchaintips.py

@@ -8,15 +8,17 @@
 # This gives us two tips, verify that it works.
 
 from test_framework.test_framework import NavCoinTestFramework
-from test_framework.util import assert_equal
+from test_framework.util import assert_equal, slow_gen
 
 class GetChainTipsTest (NavCoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 4
-        self.setup_clean_chain = False
+        self.setup_clean_chain = True
 
     def run_test (self):
+        slow_gen(self.nodes[0], 200)
+        self.sync_all()
 
         tips = self.nodes[0].getchaintips ()
         assert_equal (len (tips), 1)
@@ -26,8 +28,8 @@ def run_test (self):
 
         # Split the network and build two chains of different lengths.
         self.split_network ()
-        self.nodes[0].generate(10)
-        self.nodes[2].generate(20)
+        slow_gen(self.nodes[0], 10)
+        slow_gen(self.nodes[2], 20)
         self.sync_all ()
 
         tips = self.nodes[1].getchaintips ()

qa/rpc-tests/httpbasics.py

@@ -17,7 +17,7 @@ class HTTPBasicsTest (NavCoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 3
-        self.setup_clean_chain = False
+        self.setup_clean_chain = True
 
     def setup_network(self):
         self.nodes = self.setup_nodes()

qa/rpc-tests/importprunedfunds.py

@@ -25,7 +25,7 @@ def run_test (self):
         begintime = int(time.time())
 
         print("Mining blocks...")
-        self.nodes[0].generate(101)
+        slow_gen(self.nodes[0], 101)
 
         # sync
         self.sync_all()
@@ -63,18 +63,18 @@ def run_test (self):
 
         #Send funds to self
         txnid1 = self.nodes[0].sendtoaddress(address1, 0.1)
-        self.nodes[0].generate(1)
+        slow_gen(self.nodes[0], 1)
         rawtxn1 = self.nodes[0].gettransaction(txnid1)['hex']
         proof1 = self.nodes[0].gettxoutproof([txnid1])
 
         txnid2 = self.nodes[0].sendtoaddress(address2, 0.05)
-        self.nodes[0].generate(1)
+        slow_gen(self.nodes[0], 1)
         rawtxn2 = self.nodes[0].gettransaction(txnid2)['hex']
         proof2 = self.nodes[0].gettxoutproof([txnid2])
 
 
         txnid3 = self.nodes[0].sendtoaddress(address3, 0.025)
-        self.nodes[0].generate(1)
+        slow_gen(self.nodes[0], 1)
         rawtxn3 = self.nodes[0].gettransaction(txnid3)['hex']
         proof3 = self.nodes[0].gettxoutproof([txnid3])
 

qa/rpc-tests/mempool_spendcoinbase.py

@@ -22,7 +22,7 @@ class MempoolSpendCoinbaseTest(NavCoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 1
-        self.setup_clean_chain = False
+        self.setup_clean_chain = True
 
     def setup_network(self):
         # Just need one node for this test
@@ -32,32 +32,33 @@ def setup_network(self):
         self.is_network_split = False
 
     def run_test(self):
+        slow_gen(self.nodes[0], 200)
         chain_height = self.nodes[0].getblockcount()
         assert_equal(chain_height, 200)
         node0_address = self.nodes[0].getnewaddress()
 
-        # Coinbase at height chain_height-100+1 ok in mempool, should
-        # get mined. Coinbase at height chain_height-100+2 is
+        # Coinbase at height chain_height-150+1 ok in mempool, should
+        # get mined. Coinbase at height chain_height-150+2 is
         # is too immature to spend.
-        b = [ self.nodes[0].getblockhash(n) for n in range(101, 103) ]
+        b = [ self.nodes[0].getblockhash(n) for n in range(151, 153) ]
         coinbase_txids = [ self.nodes[0].getblock(h)['tx'][0] for h in b ]
         spends_raw = [ create_tx(self.nodes[0], txid, node0_address, 49.99) for txid in coinbase_txids ]
 
-        spend_101_id = self.nodes[0].sendrawtransaction(spends_raw[0])
+        spend_151_id = self.nodes[0].sendrawtransaction(spends_raw[0])
 
-        # coinbase at height 102 should be too immature to spend
+        # coinbase at height 152 should be too immature to spend
         assert_raises(JSONRPCException, self.nodes[0].sendrawtransaction, spends_raw[1])
 
-        # mempool should have just spend_101:
-        assert_equal(self.nodes[0].getrawmempool(), [ spend_101_id ])
+        # mempool should have just spend_151:
+        assert_equal(self.nodes[0].getrawmempool(), [ spend_151_id ])
 
-        # mine a block, spend_101 should get confirmed
-        self.nodes[0].generate(1)
+        # mine a block, spend_151 should get confirmed
+        slow_gen(self.nodes[0], 1)
         assert_equal(set(self.nodes[0].getrawmempool()), set())
 
-        # ... and now height 102 can be spent:
-        spend_102_id = self.nodes[0].sendrawtransaction(spends_raw[1])
-        assert_equal(self.nodes[0].getrawmempool(), [ spend_102_id ])
+        # ... and now height 152 can be spent:
+        spend_152_id = self.nodes[0].sendrawtransaction(spends_raw[1])
+        assert_equal(self.nodes[0].getrawmempool(), [ spend_152_id ])
 
 if __name__ == '__main__':
     MempoolSpendCoinbaseTest().main()

qa/rpc-tests/merkle_blocks.py

@@ -34,9 +34,8 @@ def setup_network(self):
 
     def run_test(self):
         print("Mining blocks...")
-        self.nodes[0].generate(105)
+        slow_gen(self.nodes[0], 105)
         self.sync_all()
-
         chain_height = self.nodes[1].getblockcount()
         assert_equal(chain_height, 105)
         assert_equal(self.nodes[1].getbalance(), 0)
@@ -49,7 +48,7 @@ def run_test(self):
         txid2 = self.nodes[0].sendrawtransaction(self.nodes[0].signrawtransaction(tx2)["hex"])
         assert_raises(JSONRPCException, self.nodes[0].gettxoutproof, [txid1])
 
-        self.nodes[0].generate(1)
+        slow_gen(self.nodes[0], 1)
         blockhash = self.nodes[0].getblockhash(chain_height + 1)
         self.sync_all()
 
@@ -65,9 +64,8 @@ def run_test(self):
         txin_spent = self.nodes[1].listunspent(1).pop()
         tx3 = self.nodes[1].createrawtransaction([txin_spent], {self.nodes[0].getnewaddress(): 49.98})
         self.nodes[0].sendrawtransaction(self.nodes[1].signrawtransaction(tx3)["hex"])
-        self.nodes[0].generate(1)
+        slow_gen(self.nodes[0], 1)
         self.sync_all()
-
         txid_spent = txin_spent["txid"]
         txid_unspent = txid1 if txin_spent["txid"] != txid1 else txid2
 
@@ -86,3 +84,4 @@ def run_test(self):
 
 if __name__ == '__main__':
     MerkleBlockTest().main()
+

qa/rpc-tests/multi_rpc.py

@@ -18,7 +18,7 @@ class HTTPBasicsTest (NavCoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.setup_clean_chain = False
+        self.setup_clean_chain = True
         self.num_nodes = 1
 
     def setup_chain(self):

qa/rpc-tests/nodehandling.py

@@ -18,7 +18,7 @@ class NodeHandlingTest (NavCoinTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 4
-        self.setup_clean_chain = False
+        self.setup_clean_chain = True
 
     def run_test(self):
         ###########################

qa/rpc-tests/rawtransactions.py

@@ -38,21 +38,20 @@ def setup_network(self, split=False):
     def run_test(self):
 
         #prepare some coins for multiple *rawtransaction commands
-        self.nodes[2].generate(1)
+        slow_gen(self.nodes[2], 1)
         self.sync_all()
-        self.nodes[0].generate(101)
+        slow_gen(self.nodes[0], 101)
         self.sync_all()
         self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),1.5)
         self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),1.0)
         self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),5.0)
         self.sync_all()
-        self.nodes[0].generate(5)
+        slow_gen(self.nodes[0], 5)
         self.sync_all()
 
-        #########################################
         # sendrawtransaction with missing input #
         #########################################
-        inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1}] #won't exists
+        inputs  = [ {'txid' : "3160bbeb3bdd39520dfb3538ce94c7073d8f987e8f1fc3b97acdf2238136c35f", 'vout' : 1}] #won't exist
         outputs = { self.nodes[0].getnewaddress() : 4.998 }
         rawtx   = self.nodes[2].createrawtransaction(inputs, outputs)
         rawtx   = self.nodes[2].signrawtransaction(rawtx)
@@ -84,7 +83,7 @@ def run_test(self):
         # send 1.2 NAV to msig adr
         txId = self.nodes[0].sendtoaddress(mSigObj, 1.2)
         self.sync_all()
-        self.nodes[0].generate(1)
+        slow_gen(self.nodes[0], 1)
         self.sync_all()
         assert_equal(self.nodes[2].getbalance(), bal+Decimal('1.20000000')) #node2 has both keys of the 2of2 ms addr., tx should affect the balance
 
@@ -107,7 +106,7 @@ def run_test(self):
         rawTx = self.nodes[0].decoderawtransaction(decTx['hex'])
         sPK = rawTx['vout'][0]['scriptPubKey']['hex']
         self.sync_all()
-        self.nodes[0].generate(1)
+        slow_gen(self.nodes[0], 1)
         self.sync_all()
 
         #THIS IS A INCOMPLETE FEATURE
@@ -134,25 +133,24 @@ def run_test(self):
         self.nodes[2].sendrawtransaction(rawTxSigned['hex'])
         rawTx = self.nodes[0].decoderawtransaction(rawTxSigned['hex'])
         self.sync_all()
-        self.nodes[0].generate(1)
+        slow_gen(self.nodes[0], 1)
         self.sync_all()
         assert_equal(self.nodes[0].getbalance(), bal+Decimal('50.00000000')+Decimal('2.19000000')) #block reward + tx
-
-        inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1, 'sequence' : 1000}]
+        inputs  = [ {'txid' : "3160bbeb3bdd39520dfb3538ce94c7073d8f987e8f1fc3b97acdf2238136c35f", 'vout' : 1, 'sequence' : 1000}]
         outputs = { self.nodes[0].getnewaddress() : 1 }
         rawtx   = self.nodes[0].createrawtransaction(inputs, outputs)
         decrawtx= self.nodes[0].decoderawtransaction(rawtx)
         assert_equal(decrawtx['vin'][0]['sequence'], 1000)
 
-        inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1, 'sequence' : -1}]
+        inputs  = [ {'txid' : "3160bbeb3bdd39520dfb3538ce94c7073d8f987e8f1fc3b97acdf2238136c35f", 'vout' : 1, 'sequence' : -1}]
         outputs = { self.nodes[0].getnewaddress() : 1 }
         assert_raises(JSONRPCException, self.nodes[0].createrawtransaction, inputs, outputs)
 
-        inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1, 'sequence' : 4294967296}]
+        inputs  = [ {'txid' : "3160bbeb3bdd39520dfb3538ce94c7073d8f987e8f1fc3b97acdf2238136c35f", 'vout' : 1, 'sequence' : 4294967296}]
         outputs = { self.nodes[0].getnewaddress() : 1 }
         assert_raises(JSONRPCException, self.nodes[0].createrawtransaction, inputs, outputs)
 
-        inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1, 'sequence' : 4294967294}]
+        inputs  = [ {'txid' : "3160bbeb3bdd39520dfb3538ce94c7073d8f987e8f1fc3b97acdf2238136c35f", 'vout' : 1, 'sequence' : 4294967294}]
         outputs = { self.nodes[0].getnewaddress() : 1 }
         rawtx   = self.nodes[0].createrawtransaction(inputs, outputs)
         decrawtx= self.nodes[0].decoderawtransaction(rawtx)