Stuck in the grind

qa/hush/create_benchmark_archive.py

@@ -1,3 +1,6 @@
+# Copyright (c) 2016-2020 The Hush developers
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 import binascii
 import calendar
 import json
@@ -10,13 +13,13 @@ import sys
 import tarfile
 import time
 
-ZCASH_CLI = './src/zcash-cli'
+HUSH_CLI = './src/hush-cli'
 USAGE = """
 Requirements:
 - find
 - xz
-- %s (edit ZCASH_CLI in this script to alter the path)
-- A running mainnet zcashd using the default datadir with -txindex=1
+- %s (edit HUSH_CLI in this script to alter the path)
+- A running mainnet hushd using the default datadir with -txindex=1
 
 Example usage:
 
@@ -25,11 +28,11 @@ virtualenv venv
 . venv/bin/activate
 pip install --global-option=build_ext --global-option="-L$(pwd)/src/leveldb/" --global-option="-I$(pwd)/src/leveldb/include/" plyvel
 pip install progressbar2
-LD_LIBRARY_PATH=src/leveldb python qa/zcash/create_benchmark_archive.py
-""" % ZCASH_CLI
+LD_LIBRARY_PATH=src/leveldb python qa/hush/create_benchmark_archive.py
+""" % HUSH_CLI
 
 def check_deps():
-    if subprocess.call(['which', 'find', 'xz', ZCASH_CLI], stdout=subprocess.PIPE):
+    if subprocess.call(['which', 'find', 'xz', HUSH_CLI], stdout=subprocess.PIPE):
         print USAGE
         sys.exit()
 
@@ -154,15 +157,15 @@ def deterministic_filter(tarinfo):
     return tarinfo
 
 def create_benchmark_archive(blk_hash):
-    blk = json.loads(subprocess.check_output([ZCASH_CLI, 'getblock', blk_hash]))
+    blk = json.loads(subprocess.check_output([HUSH_CLI, 'getblock', blk_hash]))
     print 'Height: %d' % blk['height']
     print 'Transactions: %d' % len(blk['tx'])
 
     os.mkdir('benchmark')
     with open('benchmark/block-%d.dat' % blk['height'], 'wb') as f:
-        f.write(binascii.unhexlify(subprocess.check_output([ZCASH_CLI, 'getblock', blk_hash, 'false']).strip()))
+        f.write(binascii.unhexlify(subprocess.check_output([HUSH_CLI, 'getblock', blk_hash, 'false']).strip()))
 
-    txs = [json.loads(subprocess.check_output([ZCASH_CLI, 'getrawtransaction', tx, '1'])
+    txs = [json.loads(subprocess.check_output([HUSH_CLI, 'getrawtransaction', tx, '1'])
                      ) for tx in blk['tx']]
 
     js_txs = len([tx for tx in txs if len(tx['vjoinsplit']) > 0])
@@ -187,7 +190,7 @@ def create_benchmark_archive(blk_hash):
     bar = progressbar.ProgressBar(redirect_stdout=True)
     print 'Collecting input coins for block'
     for tx in bar(unique_inputs.keys()):
-        rawtx = json.loads(subprocess.check_output([ZCASH_CLI, 'getrawtransaction', tx, '1']))
+        rawtx = json.loads(subprocess.check_output([HUSH_CLI, 'getrawtransaction', tx, '1']))
 
         mask_size = 0
         mask_code = 0
@@ -235,7 +238,7 @@ def create_benchmark_archive(blk_hash):
                     binascii.unhexlify(rawtx['vout'][i]['scriptPubKey']['hex'])))
         # - VARINT(nHeight)
         coins.extend(encode_varint(json.loads(
-            subprocess.check_output([ZCASH_CLI, 'getblockheader', rawtx['blockhash']])
+            subprocess.check_output([HUSH_CLI, 'getblockheader', rawtx['blockhash']])
             )['height']))
 
         db_key = b'c' + bytes(binascii.unhexlify(tx)[::-1])

qa/hush/create_wallet_200k_utxos.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python2
+# Copyright (c) 2016-2020 The Hush developers
 # Copyright (c) 2017 The Zcash developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
-
-#
 # Create a large wallet
 #
 # To use:
@@ -11,7 +10,6 @@
 # - Add wallet_large.py to RPC tests list
 # - ./qa/pull-tester/rpc-tests.sh wallet_large --nocleanup
 # - Archive the resulting /tmp/test###### directory
-#
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (

qa/hush/full-test-suite.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env python2
 # Copyright (c) 2016-2020 The Hush developers
-# Released under the GPLv3
 # Execute all of the automated tests related to Hush
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 import argparse
 import os

qa/hush/full_test_suite.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python2
 # Copyright (c) 2016-2020 The Hush developers
-# Released under the GPLv3
-#
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 # Execute all of the automated tests related to Hush
-#
 
 import argparse
 from glob import glob