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

./test.sh now runs successfully and we can now write RPC tests

Browse Source
This commit is contained in:
Duke
2025-08-12 22:17:18 -04:00
parent c8e1b598bc
commit 465fe58e6a
4 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ from test_framework.test_framework import BitcoinTestFramework
from test_framework.authproxy import JSONRPCException from test_framework.authproxy import JSONRPCException
from test_framework.util import assert_equal, assert_greater_than, \ from test_framework.util import assert_equal, assert_greater_than, \
initialize_chain_clean, initialize_chain, start_nodes, start_node, connect_nodes_bi, \ initialize_chain_clean, initialize_chain, start_nodes, start_node, connect_nodes_bi, \
stop_nodes, sync_blocks, sync_mempools, wait_bitcoinds, rpc_port, assert_raises stop_nodes, sync_blocks, sync_mempools, wait_bitcoinds, rpc_port, assert_raises, assert_true
import time import time
from decimal import Decimal from decimal import Decimal
@@ -21,16 +21,11 @@ def assert_success(result):
def assert_error(result): def assert_error(result):
assert_equal(result['result'], 'error') assert_equal(result['result'], 'error')
def generate_random_string(length): class PrivateTest (BitcoinTestFramework):
random_string = ''.join(choice(ascii_uppercase) for i in range(length))
return random_string
class AssetChainPrivateTest (BitcoinTestFramework):
def setup_chain(self): def setup_chain(self):
print("Initializing ac_private test directory "+self.options.tmpdir) print("Initializing ac_private test directory "+self.options.tmpdir)
self.num_nodes = 1 self.num_nodes = 1
self.options.nocleanup = 1 # do not delete datadir after test run
initialize_chain_clean(self.options.tmpdir, self.num_nodes) initialize_chain_clean(self.options.tmpdir, self.num_nodes)
def setup_network(self, split = False): def setup_network(self, split = False):
@@ -40,17 +35,18 @@ class AssetChainPrivateTest (BitcoinTestFramework):
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=ZZZ', '-ac_name=ZZZ',
'-conf='+self.options.tmpdir+'/node0/ZZZ.conf', '-conf='+self.options.tmpdir+'/node0/regtest/ZZZ.conf',
'-port=64367', '-port=64367',
'-rpcport=64368', '-rpcport=64368',
'-ac_supply=0', '-ac_supply=10',
'-ac_reward=25600000000', '-ac_reward=25600000000',
'-ac_private=1', '-ac_private=1',
'-allowlist=127.0.0.1', '-allowlist=127.0.0.1',
'-debug', #'-debug',
'-regtest',
'--daemon', '--daemon',
'-rpcuser=rt', '-rpcuser=hush',
'-rpcpassword=rt' '-rpcpassword=puppy'
]] ]]
) )
self.is_network_split = split self.is_network_split = split
@@ -68,23 +64,23 @@ class AssetChainPrivateTest (BitcoinTestFramework):
def run_test (self): def run_test (self):
print("Mining blocks...") print("Mining blocks...")
rpc = self.nodes[0] rpc = self.nodes[0]
# utxos from block 1 become mature in block 101 rpc.generate(1)
rpc.generate(101)
self.sync_all() self.sync_all()
rpc.getinfo() rpc.getinfo()
rpc.getwalletinfo() rpc.getwalletinfo()
taddr = rpc.getnewaddress() taddr = rpc.getnewaddress()
print("Sending to " + taddr)
# sending to arbitrary non-notary transparent address is not allowed
assert_raises(JSONRPCException, rpc.sendtoaddress, taddr,1)
# this is a current notary address # sending to arbitrary non-notary transparent address is not allowed
# TODO: keep in sync when notaries change print("Sending to " + taddr)
#dev1_jl777 = "RNJmgYaFF5DbnrNUX6pMYz9rcnDKC2tuAc" try:
# taddr vout is only allowed if it is a notary address rpc.sendtoaddress(taddr, 1)
#txid = rpc.sendtoaddress(dev1_jl777, 7) except:
#assert txid, 'got txid' assert_true(1)
# this should work but don't
#assert_raises(JSONRPCException, rpc.sendtoaddress, taddr,1)
if __name__ == '__main__': if __name__ == '__main__':
AssetChainPrivateTest ().main() PrivateTest ().main()

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

@@ -134,10 +134,10 @@ class BitcoinTestFramework(object):
stop_nodes(self.nodes) stop_nodes(self.nodes)
wait_bitcoinds() wait_bitcoinds()
else: else:
print("Note: hushds were not stopped and may still be running") print("Note: nodes were not stopped and may still be running")
if not self.options.nocleanup and not self.options.noshutdown: if not self.options.nocleanup and not self.options.noshutdown:
print("Cleaning up") print("Deleting %s" % self.options.tmpdir)
shutil.rmtree(self.options.tmpdir) shutil.rmtree(self.options.tmpdir)
if success: if success:

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

@@ -57,7 +57,9 @@ def sync_blocks(rpc_connections, wait=1):
break break
time.sleep(wait) time.sleep(wait)
# Now that the block counts are in sync, wait for the internal return
# Now that the block counts are in sync, wait for the internal
# notifications to finish # notifications to finish
while True: while True:
notified = [ x.getblockchaininfo()['fullyNotified'] for x in rpc_connections ] notified = [ x.getblockchaininfo()['fullyNotified'] for x in rpc_connections ]
@@ -80,6 +82,7 @@ def sync_mempools(rpc_connections, wait=1):
break break
time.sleep(wait) time.sleep(wait)
return
# Now that the mempools are in sync, wait for the internal # Now that the mempools are in sync, wait for the internal
# notifications to finish # notifications to finish
while True: while True:
@@ -91,13 +94,14 @@ def sync_mempools(rpc_connections, wait=1):
bitcoind_processes = {} bitcoind_processes = {}
def initialize_datadir(dirname, n): def initialize_datadir(dirname, n):
datadir = os.path.join(dirname, "node"+str(n)) datadir = os.path.join(dirname, "node"+str(n), "regtest")
datadir = os.path.join(datadir,"HUSH3") #datadir = os.path.join(datadir,"ZZZ")
if not os.path.isdir(datadir): if not os.path.isdir(datadir):
print("Creating dirs %s" % datadir)
os.makedirs(datadir) os.makedirs(datadir)
print("Writing to " + os.path.join(datadir,"HUSH3.conf")) print("Writing to " + os.path.join(datadir,"ZZZ.conf"))
with open(os.path.join(datadir, "HUSH3.conf"), 'w') as f: with open(os.path.join(datadir, "ZZZ.conf"), 'w') as f:
f.write("regtest=1\n"); f.write("regtest=1\n");
f.write("txindex=1\n"); f.write("txindex=1\n");
f.write("server=1\n"); f.write("server=1\n");
@@ -113,7 +117,9 @@ def initialize_datadir(dirname, n):
f.write("addressindex=1\n"); f.write("addressindex=1\n");
f.write("spentindex=1\n"); f.write("spentindex=1\n");
f.write("timestampindex=1\n"); f.write("timestampindex=1\n");
f.write("zindex=1\n"); #f.write("zindex=1\n");
print("Done writing to %s" % os.path.join(datadir,"ZZZ.conf") )
return datadir return datadir
def initialize_chain(test_dir): def initialize_chain(test_dir):
@@ -221,14 +227,14 @@ 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) + "in dir " + dirname) print("Starting node " + str(i) + " in dir " + dirname)
datadir = os.path.join(dirname, "node"+str(i)) datadir = os.path.join(dirname, "node"+str(i), "regtest")
# creating special config in case of cryptocondition asset chain test # creating special config
if len(extra_args) > 0 and extra_args[0] == '-ac_name=ZZZ': if len(extra_args) > 0 and extra_args[0] == '-ac_name=ZZZ':
configpath = datadir + "/ZZZ.conf" configpath = datadir + "/ZZZ.conf"
with open(configpath, "w+") as config: with open(configpath, "w+") as config:
config.write("rpcuser=rt\n") config.write("rpcuser=hush\n")
config.write("rpcpassword=rt\n") config.write("rpcpassword=puppy\n")
port = extra_args[3] port = extra_args[3]
config.write("rpcport=" + (port[9:]) + "\n") config.write("rpcport=" + (port[9:]) + "\n")
config.write("server=1\n") config.write("server=1\n")
@@ -236,18 +242,22 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
config.write("rpcworkqueue=256\n") config.write("rpcworkqueue=256\n")
config.write("rpcallowip=127.0.0.1\n") config.write("rpcallowip=127.0.0.1\n")
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\n")
print("Done writing to %s" % configpath)
if binary is None: if binary is None:
binary = os.getenv("BITCOIND", "src/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", "src/hush-cli") cmd = os.getenv("BITCOINCLI", "src/hush-cli")
print("cmd=" + cmd) print("cmd=" + cmd)
cmd_args = ' '.join(extra_args) + " -rpcwait getblockcount " args = [ extra_args[0], "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ]
cmd_args = ' '.join(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
@@ -262,12 +272,12 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
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) print("port=%s" % port)
username = rpc_username() username = rpc_username()
password = rpc_password() password = rpc_password()
url = "http://%s:%s@%s:%s" % (username, password, rpchost or '127.0.0.1', port) url = "http://%s:%s@%s:%s" % (username, password, rpchost or '127.0.0.1', port[9:])
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)

1
test.sh
View File

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