DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Work towards getting RPC tests working again

Browse Source 
So much has changed since I originally got the RPC tests working many years ago,
most notably modern Linux distros don't even have a way to install python2 via
packages, you have to install from source. Continuing with python2 does not seem
like a good idea, so we begin migrating thigns to Python 3.

Currently running ./test.sh will successfully spin up a test chain but then
the test suite crashes when attempting to send an RPC request, which looks
to be caused by the test suite internals still expecting python2.
This commit is contained in:
Duke
2025-08-12 17:19:04 -04:00
parent 37fe953ea4
commit fb062d2849
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
qa/rpc-tests/ac_private.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python2 #!/usr/bin/env python3
# Copyright (c) 2016-2024 The Hush developers # Copyright (c) 2016-2024 The Hush developers
# Copyright (c) 2018 SuperNET developers # Copyright (c) 2018 SuperNET developers
# Distributed under the GPLv3 software license, see the accompanying # Distributed under the GPLv3 software license, see the accompanying
@@ -39,13 +39,10 @@ class AssetChainPrivateTest (BitcoinTestFramework):
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
extra_args=[[ extra_args=[[
# always give -ac_name as first extra_arg and port as third # always give -ac_name as first extra_arg and port as third
'-ac_name=REGTEST', '-ac_name=ZZZ',
'-conf='+self.options.tmpdir+'/node0/REGTEST.conf', '-conf='+self.options.tmpdir+'/node0/ZZZ.conf',
'-port=64367', '-port=64367',
'-rpcport=64368', '-rpcport=64368',
'-regtest',
'-addressindex=1',
'-spentindex=1',
'-ac_supply=0', '-ac_supply=0',
'-ac_reward=25600000000', '-ac_reward=25600000000',
'-ac_private=1', '-ac_private=1',
@@ -78,7 +75,7 @@ class AssetChainPrivateTest (BitcoinTestFramework):
rpc.getwalletinfo() rpc.getwalletinfo()
taddr = rpc.getnewaddress() taddr = rpc.getnewaddress()
print "Sending to " + taddr print("Sending to " + taddr)
# sending to arbitrary non-notary transparent address is not allowed # sending to arbitrary non-notary transparent address is not allowed
assert_raises(JSONRPCException, rpc.sendtoaddress, taddr,1) assert_raises(JSONRPCException, rpc.sendtoaddress, taddr,1)

1
qa/rpc-tests/test_framework/authproxy.py
View File

@@ -142,6 +142,7 @@ class AuthServiceProxy(object):
'method': self.__service_name, 'method': self.__service_name,
'params': args, 'params': args,
'id': AuthServiceProxy.__id_count}, default=EncodeDecimal) 'id': AuthServiceProxy.__id_count}, default=EncodeDecimal)
print("self.__url.path=" + self.__url.path)
response = self._request('POST', self.__url.path, postdata) response = self._request('POST', self.__url.path, postdata)
if response['error'] is not None: if response['error'] is not None:
raise JSONRPCException(response['error']) raise JSONRPCException(response['error'])

2
qa/rpc-tests/test_framework/test_framework.py
View File

@@ -169,7 +169,7 @@ class ComparisonTestFramework(BitcoinTestFramework):
help="bitcoind binary to use for reference nodes (if any)") help="bitcoind binary to use for reference nodes (if any)")
def setup_chain(self): def setup_chain(self):
print "Initializing test directory "+self.options.tmpdir print("Initializing test directory "+self.options.tmpdir)
initialize_chain_clean(self.options.tmpdir, self.num_nodes) initialize_chain_clean(self.options.tmpdir, self.num_nodes)
def setup_network(self): def setup_network(self):

26
qa/rpc-tests/test_framework/util.py
View File

@@ -107,7 +107,7 @@ def initialize_datadir(dirname, n):
f.write("port="+str(p2p_port(n))+"\n"); f.write("port="+str(p2p_port(n))+"\n");
rpcport = str(rpc_port(n)) rpcport = str(rpc_port(n))
f.write("rpcport="+rpcport+"\n"); f.write("rpcport="+rpcport+"\n");
print "RPC port=" + rpcport print("RPC port=" + rpcport)
f.write("listenonion=0\n"); f.write("listenonion=0\n");
# TODO: maybe make these optional, via arg to initialize_datadir, defaulted to on for now # TODO: maybe make these optional, via arg to initialize_datadir, defaulted to on for now
f.write("addressindex=1\n"); f.write("addressindex=1\n");
@@ -136,14 +136,14 @@ def initialize_chain(test_dir):
cmd = os.getenv("BITCOINCLI", "hush-cli") cmd = os.getenv("BITCOINCLI", "hush-cli")
cmd_args = cmd + " -datadir="+datadir + " -rpcwait getblockcount" cmd_args = cmd + " -datadir="+datadir + " -rpcwait getblockcount"
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print "initialize_chain: hushd started, calling: " + cmd_args print("initialize_chain: hushd started, calling: " + cmd_args)
strcmd = cmd + " " + "-datadir="+datadir + " -rpcwait getblockcount" strcmd = cmd + " " + "-datadir="+datadir + " -rpcwait getblockcount"
print("Running " + strcmd) print("Running " + strcmd)
subprocess.check_call(strcmd, shell=True); subprocess.check_call(strcmd, shell=True);
#subprocess.check_call([ cmd, "-rpcwait", "getblockcount"], stdout=devnull) #subprocess.check_call([ cmd, "-rpcwait", "getblockcount"], stdout=devnull)
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print "initialize_chain: hush-cli -rpcwait getblockcount completed" print("initialize_chain: hush-cli -rpcwait getblockcount completed")
devnull.close() devnull.close()
rpcs = [] rpcs = []
for i in range(4): for i in range(4):
@@ -175,7 +175,7 @@ def initialize_chain(test_dir):
stop_nodes(rpcs) stop_nodes(rpcs)
wait_bitcoinds() wait_bitcoinds()
for i in range(4): for i in range(4):
print "Cleaning up cache dir files" print("Cleaning up cache dir files")
os.remove(log_filename("cache", i, "debug.log")) os.remove(log_filename("cache", i, "debug.log"))
os.remove(log_filename("cache", i, "db.log")) os.remove(log_filename("cache", i, "db.log"))
os.remove(log_filename("cache", i, "peers.dat")) os.remove(log_filename("cache", i, "peers.dat"))
@@ -221,13 +221,12 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
""" """
Start a hushd and return RPC connection to it Start a hushd and return RPC connection to it
""" """
print("Starting node " + str(i)) print("Starting node " + str(i) + "in dir " + dirname)
datadir = os.path.join(dirname, "node"+str(i)) datadir = os.path.join(dirname, "node"+str(i))
# creating special config in case of cryptocondition asset chain test # creating special config in case of cryptocondition asset chain test
if len(extra_args) > 0 and extra_args[0] == '-ac_name=REGTEST': if len(extra_args) > 0 and extra_args[0] == '-ac_name=ZZZ':
configpath = datadir + "/REGTEST.conf" configpath = datadir + "/ZZZ.conf"
with open(configpath, "w+") as config: with open(configpath, "w+") as config:
config.write("regtest=1\n")
config.write("rpcuser=rt\n") config.write("rpcuser=rt\n")
config.write("rpcpassword=rt\n") config.write("rpcpassword=rt\n")
port = extra_args[3] port = extra_args[3]
@@ -239,18 +238,18 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
config.write("bind=127.0.0.1\n") config.write("bind=127.0.0.1\n")
config.write("rpcbind=127.0.0.1") config.write("rpcbind=127.0.0.1")
if binary is None: if binary is None:
binary = os.getenv("BITCOIND", "hushd") binary = os.getenv("BITCOIND", "src/hushd")
args = [ binary, "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ] args = [ binary, "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ]
if extra_args is not None: args.extend(extra_args) if extra_args is not None: args.extend(extra_args)
#print("args=" + ' '.join(args)) #print("args=" + ' '.join(args))
bitcoind_processes[i] = subprocess.Popen(args) bitcoind_processes[i] = subprocess.Popen(args)
devnull = open("/dev/null", "w+") devnull = open("/dev/null", "w+")
cmd = os.getenv("BITCOINCLI", "hush-cli") cmd = os.getenv("BITCOINCLI", "src/hush-cli")
print("cmd=" + cmd) print("cmd=" + cmd)
cmd_args = ' '.join(extra_args) + " -rpcwait getblockcount " cmd_args = ' '.join(extra_args) + " -rpcwait getblockcount "
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print "start_node: hushd started, calling : " + cmd + " " + cmd_args print("start_node: hushd started, calling : " + cmd + " " + cmd_args)
strcmd = cmd + " " + cmd_args strcmd = cmd + " " + cmd_args
print("Running " + strcmd) print("Running " + strcmd)
@@ -261,13 +260,14 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
# _rpchost_to_args(rpchost) + # _rpchost_to_args(rpchost) +
# ["-rpcwait", "-rpcport=6438", "getblockcount"], stdout=devnull) # ["-rpcwait", "-rpcport=6438", "getblockcount"], stdout=devnull)
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print "start_node: calling hush-cli -rpcwait getblockcount returned" print("start_node: calling hush-cli -rpcwait getblockcount returned")
devnull.close() devnull.close()
#port = extra_args[3] #port = extra_args[3]
port = rpc_port(i) port = rpc_port(i)
print("port=%s" % port)
username = rpc_username() username = rpc_username()
password = rpc_password() password = rpc_password()
url = "http://%s:%s@%s:%d" % (username, password, rpchost or '127.0.0.1', int(port[9:])) url = "http://%s:%s@%s:%s" % (username, password, rpchost or '127.0.0.1', port)
print("connecting to " + url) print("connecting to " + url)
if timewait is not None: if timewait is not None:
proxy = AuthServiceProxy(url, timeout=timewait) proxy = AuthServiceProxy(url, timeout=timewait)

3
test.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
PYTHONPATH=./qa/rpc-tests/test_framework/ ./qa/rpc-tests/ac_private.py