Rename the bitcoind-era public test-framework API to Z3 names

qa/rpc-tests/addnode.py

@@ -3,10 +3,10 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import assert_equal, connect_nodes_bi
 
-class AddNodeTest (BitcoinTestFramework):
+class AddNodeTest (ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/addressindex.py

@@ -14,14 +14,14 @@
 #   getaddressmempool
 
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 
 from test_framework.util import (
     assert_equal,
     start_nodes,
     stop_nodes,
     connect_nodes,
-    wait_bitcoinds
+    wait_nodes
 )
 
 from test_framework.script import (
@@ -43,7 +43,7 @@
 from binascii import hexlify, unhexlify
 
 
-class AddressIndexTest(BitcoinTestFramework):
+class AddressIndexTest(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()
@@ -171,7 +171,7 @@ def check_balance(node_index, address, expected_balance, expected_received=None)
 
         # Restart all nodes to ensure indices are saved to disk and recovered
         stop_nodes(self.nodes)
-        wait_bitcoinds()
+        wait_nodes()
         self.setup_network()
 
         bal = self.nodes[1].getaddressbalance(addr1)

qa/rpc-tests/blockchain.py

@@ -11,12 +11,12 @@
 
 import decimal
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import (
     assert_equal,
 )
 
-class BlockchainTest(BitcoinTestFramework):
+class BlockchainTest(ZcashTestFramework):
     """
     Test blockchain-related RPC calls:
 

qa/rpc-tests/coinbase_funding_streams.py

@@ -5,7 +5,7 @@
 
 from decimal import Decimal
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.blocktools import create_block, create_coinbase
 from test_framework.mininode import (
     fundingstream,
@@ -20,7 +20,7 @@
 )
 from test_framework.util import (
     assert_equal,
-    bitcoind_processes,
+    node_processes,
     connect_nodes,
     start_node,
     BLOSSOM_BRANCH_ID,
@@ -41,7 +41,7 @@ def redeem_script(addr):
 
     raise ValueError("unrecognized address type")
 
-class CoinbaseFundingStreamsTest(BitcoinTestFramework):
+class CoinbaseFundingStreamsTest(ZcashTestFramework):
     def __init__(self):
         super().__init__()
         self.num_nodes = 2
@@ -88,9 +88,9 @@ def run_test(self):
 
         # Restart both nodes with funding streams.
         self.nodes[0].stop()
-        bitcoind_processes[0].wait()
+        node_processes[0].wait()
         self.nodes[1].stop()
-        bitcoind_processes[1].wait()
+        node_processes[1].wait()
         new_args = [
             "-mineraddress=%s" % miner_addr,
             "-minetolocalwallet=0",

qa/rpc-tests/converttex.py

@@ -3,13 +3,13 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import (
     assert_equal,
 )
 
 
-class ConvertTEXTest(BitcoinTestFramework):
+class ConvertTEXTest(ZcashTestFramework):
     '''
     Test that the `z_converttex` RPC method correctly converts transparent
     addresses to ZIP 320 TEX addresses.

qa/rpc-tests/create_cache.py

@@ -6,12 +6,12 @@
 
 #
 # Helper script to create the cache
-# (see BitcoinTestFramework.setup_chain)
+# (see ZcashTestFramework.setup_chain)
 #
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 
-class CreateCache(BitcoinTestFramework):
+class CreateCache(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/decodescript.py

@@ -4,14 +4,14 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import assert_equal, \
     hex_str_to_bytes, bytes_to_hex_str
 from test_framework.mininode import CTransaction
 from io import BytesIO
 
 
-class DecodeScriptTest(BitcoinTestFramework):
+class DecodeScriptTest(ZcashTestFramework):
     """Tests decoding scripts via RPC command "decodescript"."""
 
     def __init__(self):

qa/rpc-tests/disablewallet.py

@@ -8,11 +8,11 @@
 # Exercise API with -disablewallet.
 #
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import start_nodes
 
 
-class DisableWalletTest (BitcoinTestFramework):
+class DisableWalletTest (ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/errors.py

@@ -9,9 +9,9 @@
 #
 
 from test_framework.authproxy import JSONRPCException
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 
-class BlockchainTest(BitcoinTestFramework):
+class BlockchainTest(ZcashTestFramework):
     """
     Test RPC call failure cases.
     """

qa/rpc-tests/feature_backup_non_finalized_state.py

@@ -3,12 +3,12 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import assert_equal, start_nodes
 import time
 
 # Test that Zebra can backup and restore non finalized state
-class BackupNonFinalized(BitcoinTestFramework):
+class BackupNonFinalized(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/feature_logging.py

@@ -9,9 +9,9 @@
 
 from test_framework.util import start_node, stop_node, assert_start_raises_init_error
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 
-class LoggingTest(BitcoinTestFramework):
+class LoggingTest(ZcashTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.num_wallets = 0

qa/rpc-tests/feature_nu6.py

@@ -7,7 +7,7 @@
 
 from test_framework.config import ZebraArgs
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import assert_equal, start_nodes
 
 # Check the behaviour of the value pools and funding streams at NU6.
@@ -16,7 +16,7 @@
 # - The lockbox pool and rewards are activated at NU6.
 # - The lockbox accumulates after NU6 inside the configured range.
 # - The lockbox rewrards and NU6 funding streams end after the configured range.
-class PoolsTest(BitcoinTestFramework):
+class PoolsTest(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/feature_nu6_1.py

@@ -5,15 +5,15 @@
 
 from decimal import Decimal
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.config import ZebraArgs
 from test_framework.util import (
     assert_equal,
     start_node,
 )
 
 # Verify the NU6.1 activation block contains the expected lockbox disbursement.
-class OnetimeLockboxDisbursementTest(BitcoinTestFramework):
+class OnetimeLockboxDisbursementTest(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/feature_walletfile.py

@@ -9,9 +9,9 @@
 
 from test_framework.util import start_node, stop_node, assert_start_raises_init_error
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 
-class WalletFileTest(BitcoinTestFramework):
+class WalletFileTest(ZcashTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.cache_behavior = 'clean'

qa/rpc-tests/feature_zip221.py

@@ -6,7 +6,7 @@
 
 from test_framework.flyclient import (ZcashMMRNode, append, delete, make_root_commitment)
 from test_framework.mininode import (CBlockHeader)
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import (
     BLOSSOM_BRANCH_ID,
     HEARTWOOD_BRANCH_ID,
@@ -25,7 +25,7 @@
 CHAIN_HISTORY_ROOT_VERSION = 2010200
 
 # Verify block header field 'hashLightClientRoot' is set correctly for Heartwood blocks.
-class Zip221Test(BitcoinTestFramework):
+class Zip221Test(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/feature_zip239.py

@@ -15,7 +15,7 @@
     msg_reject,
     uint256_from_reversed_hex,
 )
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import (
     BLOSSOM_BRANCH_ID,
     HEARTWOOD_BRANCH_ID,
@@ -37,7 +37,7 @@
 import time
 
 # Test ZIP 239 behaviour before and after NU5.
-class Zip239Test(BitcoinTestFramework):
+class Zip239Test(ZcashTestFramework):
     def __init__(self):
         super().__init__()
         self.cache_behavior = 'sprout'

qa/rpc-tests/feature_zip244_blockcommitments.py

@@ -5,7 +5,7 @@
 
 
 from test_framework.blocktools import derive_block_commitments_hash
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import (
     BLOSSOM_BRANCH_ID,
     CANOPY_BRANCH_ID,
@@ -21,7 +21,7 @@
 TERMINATOR = b'\x00' * 32
 
 # Verify block header field 'hashLightClientRoot' is set correctly for NU5 blocks.
-class AuthDataRootTest(BitcoinTestFramework):
+class AuthDataRootTest(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/finalorchardroot.py

@@ -4,7 +4,7 @@
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import (
     NU5_BRANCH_ID,
     assert_equal,
@@ -25,7 +25,7 @@
 
 # Verify block header field 'hashFinalOrchardRoot' (returned in rpc as 'finalorchardroot')
 # is updated when Orchard transactions with outputs (commitments) are mined into a block.
-class FinalOrchardRootTest(BitcoinTestFramework):
+class FinalOrchardRootTest(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/finalsaplingroot.py

@@ -4,7 +4,7 @@
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import (
     NU5_BRANCH_ID,
     assert_equal,
@@ -25,7 +25,7 @@
 
 # Verify block header field 'hashFinalSaplingRoot' (returned in rpc as 'finalsaplingroot')
 # is updated when Sapling transactions with outputs (commitments) are mined into a block.
-class FinalSaplingRootTest(BitcoinTestFramework):
+class FinalSaplingRootTest(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/fix_block_commitments.py

@@ -3,7 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.config import ZebraArgs
 from test_framework.util import (
     assert_true,
@@ -20,7 +20,7 @@
 #
 # Previous to the fix, the blockcommitments field was zero when both
 # Heartwood and NU5 activated in the same block.
-class BlockCommitmentsTest(BitcoinTestFramework):
+class BlockCommitmentsTest(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/forknotify.py

@@ -8,12 +8,12 @@
 # Test -alertnotify 
 #
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import start_node, connect_nodes
 
 import os
 
-class ForkNotifyTest(BitcoinTestFramework):
+class ForkNotifyTest(ZcashTestFramework):
 
     def __init__(self):
         super().__init__()

qa/rpc-tests/framework.py

@@ -3,15 +3,15 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import ZcashTestFramework
 from test_framework.util import (
     assert_raises,
     connect_nodes,
     start_node,
     check_node_log,
 )
 
-class FrameworkTest (BitcoinTestFramework):
+class FrameworkTest (ZcashTestFramework):
 
     def __init__(self):
         super().__init__()