Browse Source

test suite tweaks

pull/51/head
Duke Leto 5 years ago
parent
commit
2eae4d2377
  1. 2
      qa/rpc-tests/mempool_nu_activation.py
  2. 5
      qa/rpc-tests/test_framework/mininode.py
  3. 2
      qa/rpc-tests/wallet_changeindicator.py
  4. 4
      qa/rpc-tests/wallet_listreceived.py
  5. 2
      qa/rpc-tests/zcjoinsplitdoublespend.py
  6. 2
      qa/rpc-tests/zkey_import_export.py

2
qa/rpc-tests/mempool_nu_activation.py

@ -39,7 +39,7 @@ class MempoolUpgradeActivationTest(BitcoinTestFramework):
self.nodes[0].generate(97)
self.sync_all()
# Shield some ZEC
# Shield some HUSH
node1_taddr = self.nodes[1].getnewaddress()
node0_zaddr = self.nodes[0].z_getnewaddress()
recipients = [{'address': node0_zaddr, 'amount': Decimal('10')}]

5
qa/rpc-tests/test_framework/mininode.py

@ -1,4 +1,5 @@
# mininode.py - Bitcoin P2P network half-a-node
# Copyright (c) 2019 The Hush developers
#
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -43,14 +44,14 @@ OVERWINTER_PROTO_VERSION = 170003
BIP0031_VERSION = 60000
SPROUT_PROTO_VERSION = 170002 # past bip-31 for ping/pong
SAPLING_PROTO_VERSION = 170006
MY_SUBVERSION = "/python-mininode-tester:0.0.1/"
MY_SUBVERSION = "/python-mininode-hush-tester:0.0.1/"
OVERWINTER_VERSION_GROUP_ID = 0x03C48270
MAX_INV_SZ = 50000
COIN = 100000000 # 1 zec in zatoshis
COIN = 100000000 # 1 HUSH in puposhis
# Keep our own socket map for asyncore, so that we can track disconnects
# ourselves (to workaround an issue with closing an asyncore socket when

2
qa/rpc-tests/wallet_changeindicator.py

@ -24,7 +24,7 @@ class WalletChangeIndicatorTest (BitcoinTestFramework):
self.nodes[0].sendtoaddress(taddr, Decimal('1.0'))
self.generate_and_sync()
# Send 1 ZEC to a zaddr
# Send 1 HUSH to a zaddr
wait_and_assert_operationid_status(self.nodes[1], self.nodes[1].z_sendmany(taddr, [{'address': zaddr1, 'amount': 1.0, 'memo': 'c0ffee01'}], 1, 0))
self.generate_and_sync()

4
qa/rpc-tests/wallet_listreceived.py

@ -36,7 +36,7 @@ class ListReceivedTest (BitcoinTestFramework):
self.nodes[0].sendtoaddress(taddr, 2.0)
self.generate_and_sync(height+2)
# Send 1 ZEC to zaddr1
# Send 1 HUSH to zaddr1
opid = self.nodes[1].z_sendmany(taddr,
[{'address': zaddr1, 'amount': 1, 'memo': my_memo}])
txid = wait_and_assert_operationid_status(self.nodes[1], opid)
@ -52,7 +52,7 @@ class ListReceivedTest (BitcoinTestFramework):
assert_false(r[0]['change'], "Note should not be change")
assert_equal(my_memo, r[0]['memo'])
# Confirm transaction (1 ZEC from taddr to zaddr1)
# Confirm transaction (1 HUSH from taddr to zaddr1)
self.generate_and_sync(height+3)
# Require one confirmation, note should be present

2
qa/rpc-tests/zcjoinsplitdoublespend.py

@ -40,7 +40,7 @@ class JoinSplitTest(BitcoinTestFramework):
assert_equal(self.cannot_joinsplit(node, txn), True)
def run_test(self):
# All nodes should start with 250 ZEC:
# All nodes should start with 250 HUSH:
starting_balance = 250
for i in range(4):
assert_equal(self.nodes[i].getbalance(), starting_balance)

2
qa/rpc-tests/zkey_import_export.py

@ -146,7 +146,7 @@ class ZkeyImportExportTest (BitcoinTestFramework):
bob_fee = Decimal(0)
# Try to reproduce zombie balance reported in #1936
# At generated zaddr, receive ZEC, and send ZEC back out. bob -> alice
# At generated zaddr, receive HUSH, and send HUSH back out. bob -> alice
for amount in amounts[:2]:
print("Sending amount from bob to alice: ", amount)
z_send(bob, bob_zaddr, alice_zaddr, amount)

Loading…
Cancel
Save