Fix 10 Functional Tests

test/functional/rpc_net.py

@@ -47,7 +47,7 @@ class NetTest(DigiByteTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 2
-        self.extra_args = [["-minrelaytxfee=0.00001000"], ["-minrelaytxfee=0.00000500"]]
+        self.extra_args = [["-minrelaytxfee=0.00100000"], ["-minrelaytxfee=0.00050000"]]
         self.supports_cli = False
 
     def run_test(self):
@@ -95,8 +95,8 @@ def test_getpeerinfo(self):
         # the address bound to on one side will be the source address for the other node
         assert_equal(peer_info[0][0]['addrbind'], peer_info[1][0]['addr'])
         assert_equal(peer_info[1][0]['addrbind'], peer_info[0][0]['addr'])
-        assert_equal(peer_info[0][0]['minfeefilter'], Decimal("0.00000500"))
-        assert_equal(peer_info[1][0]['minfeefilter'], Decimal("0.00001000"))
+        assert_equal(peer_info[0][0]['minfeefilter'], Decimal("0.00050500"))
+        assert_equal(peer_info[1][0]['minfeefilter'], Decimal("0.00100000"))
         # check the `servicesnames` field
         for info in peer_info:
             assert_net_servicesnames(int(info[0]["services"], 0x10), info[0]["servicesnames"])
@@ -265,4 +265,4 @@ def test_addpeeraddress(self):
 
 
 if __name__ == '__main__':
-    NetTest().main()
+    NetTest().main()

test/functional/wallet_descriptor.py

@@ -5,7 +5,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test descriptor wallet function."""
 
-from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.blocktools import COINBASE_MATURITY_2
 from test_framework.test_framework import DigiByteTestFramework
 from test_framework.util import (
     assert_equal,
@@ -85,7 +85,7 @@ def run_test(self):
         send_wrpc = self.nodes[0].get_wallet_rpc("desc1")
 
         # Generate some coins
-        send_wrpc.generatetoaddress(COINBASE_MATURITY + 1, send_wrpc.getnewaddress())
+        send_wrpc.generatetoaddress(COINBASE_MATURITY_2 + 1, send_wrpc.getnewaddress())
 
         # Make transactions
         self.log.info("Test sending and receiving")
@@ -211,4 +211,4 @@ def run_test(self):
                 assert_equal(exp_addr, imp_addr)
 
 if __name__ == '__main__':
-    WalletDescriptorTest().main ()
+    WalletDescriptorTest().main ()

test/functional/wallet_fallbackfee.py

@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test wallet replace-by-fee capabilities in conjunction with the fallbackfee."""
 
-from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.blocktools import COINBASE_MATURITY_2
 from test_framework.test_framework import DigiByteTestFramework
 from test_framework.util import assert_raises_rpc_error
 
@@ -17,7 +17,7 @@ def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
     def run_test(self):
-        self.generate(self.nodes[0], COINBASE_MATURITY + 1)
+        self.generate(self.nodes[0], COINBASE_MATURITY_2 + 1)
 
         # sending a transaction without fee estimations must be possible by default on regtest
         self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)

test/functional/wallet_labels.py

@@ -11,7 +11,7 @@
 """
 from collections import defaultdict
 
-from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.blocktools import COINBASE_MATURITY_2
 from test_framework.test_framework import DigiByteTestFramework
 from test_framework.util import assert_equal, assert_raises_rpc_error
 from test_framework.wallet_util import test_address
@@ -33,7 +33,7 @@ def run_test(self):
         # Note each time we call generate, all generated coins go into
         # the same address, so we call twice to get two addresses w/50 each
         self.generatetoaddress(node, nblocks=1, address=node.getnewaddress(label='coinbase'))
-        self.generatetoaddress(node, nblocks=COINBASE_MATURITY + 1, address=node.getnewaddress(label='coinbase'))
+        self.generatetoaddress(node, nblocks=COINBASE_MATURITY_2 + 1, address=node.getnewaddress(label='coinbase'))
         assert_equal(node.getbalance(), 72000 * 2)
 
         # there should be 2 address groups
@@ -105,7 +105,7 @@ def run_test(self):
             label.verify(node)
             assert_equal(node.getreceivedbylabel(label.name), 2)
             label.verify(node)
-        self.generate(node, COINBASE_MATURITY + 1)
+        self.generate(node, COINBASE_MATURITY_2 + 1)
 
         # Check that setlabel can assign a label to a new unused address.
         for label in labels:
@@ -125,7 +125,7 @@ def run_test(self):
                 label.add_address(multisig_address)
                 label.purpose[multisig_address] = "send"
                 label.verify(node)
-            self.generate(node, COINBASE_MATURITY + 1)
+            self.generate(node, COINBASE_MATURITY_2 + 1)
 
         # Check that setlabel can change the label of an address from a
         # different label.

test/functional/wallet_listsinceblock.py

@@ -5,7 +5,7 @@
 """Test the listsinceblock RPC."""
 
 from test_framework.address import key_to_p2wpkh
-from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.blocktools import COINBASE_MATURITY_2
 from test_framework.key import ECKey
 from test_framework.test_framework import DigiByteTestFramework
 from test_framework.messages import BIP125_SEQUENCE_NUMBER
@@ -30,7 +30,7 @@ def run_test(self):
         # All nodes are in IBD from genesis, so they'll need the miner (node2) to be an outbound connection, or have
         # only one connection. (See fPreferredDownload in net_processing)
         self.connect_nodes(1, 2)
-        self.generate(self.nodes[2], COINBASE_MATURITY + 1)
+        self.generate(self.nodes[2], COINBASE_MATURITY_2 + 1)
 
         self.test_no_blockhash()
         self.test_invalid_blockhash()

test/functional/wallet_watchonly.py

@@ -5,7 +5,7 @@
 """Test createwallet watchonly arguments.
 """
 
-from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.blocktools import COINBASE_MATURITY_2
 from test_framework.test_framework import DigiByteTestFramework
 from test_framework.util import (
     assert_equal,
@@ -37,7 +37,7 @@ def run_test(self):
         wo_wallet.importpubkey(pubkey=def_wallet.getaddressinfo(wo_change)['pubkey'])
 
         # generate some btc for testing
-        self.generatetoaddress(node, COINBASE_MATURITY + 1, a1)
+        self.generatetoaddress(node, COINBASE_MATURITY_2 + 1, a1)
 
         # send 1 btc to our watch-only address
         txid = def_wallet.sendtoaddress(wo_addr, 1)