mirror of
https://github.com/basicswap/basicswap.git
synced 2026-04-19 14:38:43 +02:00
Add Decred rpc
This commit is contained in:
@@ -41,7 +41,6 @@ from basicswap.util.address import (
|
||||
)
|
||||
from basicswap.rpc import (
|
||||
callrpc_cli,
|
||||
waitForRPC,
|
||||
)
|
||||
from basicswap.contrib.key import (
|
||||
ECKey,
|
||||
@@ -67,6 +66,7 @@ from tests.basicswap.common import (
|
||||
BASE_RPC_PORT,
|
||||
BASE_ZMQ_PORT,
|
||||
PREFIX_SECRET_KEY_REGTEST,
|
||||
waitForRPC,
|
||||
)
|
||||
from bin.basicswap_run import startDaemon
|
||||
|
||||
@@ -323,7 +323,7 @@ class Test(unittest.TestCase):
|
||||
|
||||
for i in range(NUM_NODES):
|
||||
rpc = make_part_cli_rpc_func(i)
|
||||
waitForRPC(rpc)
|
||||
waitForRPC(rpc, delay_event)
|
||||
if i == 0:
|
||||
rpc('extkeyimportmaster', ['abandon baby cabbage dad eager fabric gadget habit ice kangaroo lab absorb'])
|
||||
elif i == 1:
|
||||
@@ -340,23 +340,23 @@ class Test(unittest.TestCase):
|
||||
with open(settings_path) as fs:
|
||||
settings = json.load(fs)
|
||||
fp = open(os.path.join(basicswap_dir, 'basicswap.log'), 'w')
|
||||
cls.swap_clients.append(BasicSwap(fp, basicswap_dir, settings, 'regtest', log_name='BasicSwap{}'.format(i)))
|
||||
swap_client = cls.swap_clients[-1]
|
||||
swap_client.setDaemonPID(Coins.BTC, cls.daemons[0].handle.pid)
|
||||
swap_client.setDaemonPID(Coins.DASH, cls.daemons[1].handle.pid)
|
||||
swap_client.setDaemonPID(Coins.PART, cls.daemons[2 + i].handle.pid)
|
||||
sc = BasicSwap(fp, basicswap_dir, settings, 'regtest', log_name='BasicSwap{}'.format(i))
|
||||
cls.swap_clients.append(sc)
|
||||
sc.setDaemonPID(Coins.BTC, cls.daemons[0].handle.pid)
|
||||
sc.setDaemonPID(Coins.DASH, cls.daemons[1].handle.pid)
|
||||
sc.setDaemonPID(Coins.PART, cls.daemons[2 + i].handle.pid)
|
||||
|
||||
waitForRPC(dashRpc, expect_wallet=False)
|
||||
waitForRPC(dashRpc, delay_event, rpc_command='getblockchaininfo')
|
||||
if len(dashRpc('listwallets')) < 1:
|
||||
dashRpc('createwallet wallet.dat')
|
||||
|
||||
swap_client.start()
|
||||
sc.start()
|
||||
|
||||
t = HttpThread(cls.swap_clients[i].fp, TEST_HTTP_HOST, TEST_HTTP_PORT + i, False, swap_client)
|
||||
t = HttpThread(sc.fp, TEST_HTTP_HOST, TEST_HTTP_PORT + i, False, sc)
|
||||
cls.http_threads.append(t)
|
||||
t.start()
|
||||
|
||||
waitForRPC(dashRpc)
|
||||
waitForRPC(dashRpc, delay_event)
|
||||
num_blocks = 500
|
||||
logging.info('Mining %d dash blocks', num_blocks)
|
||||
cls.dash_addr = dashRpc('getnewaddress mining_addr')
|
||||
@@ -372,7 +372,7 @@ class Test(unittest.TestCase):
|
||||
except Exception:
|
||||
logging.info('dash: segwit is not active')
|
||||
|
||||
waitForRPC(btcRpc)
|
||||
waitForRPC(btcRpc, delay_event)
|
||||
cls.btc_addr = btcRpc('getnewaddress mining_addr bech32')
|
||||
logging.info('Mining %d Bitcoin blocks to %s', num_blocks, cls.btc_addr)
|
||||
btcRpc('generatetoaddress {} {}'.format(num_blocks, cls.btc_addr))
|
||||
|
||||
Reference in New Issue
Block a user