sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

More of 10871

Browse Source
This commit is contained in:
UdjinM6 2020-02-28 21:32:27 +03:00 committed by Pasta
parent 37580b0ba3
commit 515b9b513b
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dash-cli.cpp
View File

@ -261,6 +261,7 @@ public:
if (!batch[ID_WALLETINFO].isNull()) { if (!batch[ID_WALLETINFO].isNull()) {
result.pushKV("walletversion", batch[ID_WALLETINFO]["result"]["walletversion"]); result.pushKV("walletversion", batch[ID_WALLETINFO]["result"]["walletversion"]);
result.pushKV("balance", batch[ID_WALLETINFO]["result"]["balance"]); result.pushKV("balance", batch[ID_WALLETINFO]["result"]["balance"]);
result.pushKV("privatesend_balance", batch[ID_WALLETINFO]["result"]["privatesend_balance"]);
result.pushKV("keypoololdest", batch[ID_WALLETINFO]["result"]["keypoololdest"]); result.pushKV("keypoololdest", batch[ID_WALLETINFO]["result"]["keypoololdest"]);
result.pushKV("keypoolsize", batch[ID_WALLETINFO]["result"]["keypoolsize"]); result.pushKV("keypoolsize", batch[ID_WALLETINFO]["result"]["keypoolsize"]);
if (!batch[ID_WALLETINFO]["result"]["unlocked_until"].isNull()) { if (!batch[ID_WALLETINFO]["result"]["unlocked_until"].isNull()) {

3
test/functional/bitcoin_cli.py
View File

@ -35,7 +35,7 @@ class TestBitcoinCli(BitcoinTestFramework):
assert_equal(["foo", "bar"], self.nodes[0].cli('-rpcuser=%s' % user, '-stdin', '-stdinrpcpass', input=password + "\nfoo\nbar").echo()) assert_equal(["foo", "bar"], self.nodes[0].cli('-rpcuser=%s' % user, '-stdin', '-stdinrpcpass', input=password + "\nfoo\nbar").echo())
assert_raises_process_error(1, "incorrect rpcuser or rpcpassword", self.nodes[0].cli('-rpcuser=%s' % user, '-stdin', '-stdinrpcpass', input="foo").echo) assert_raises_process_error(1, "incorrect rpcuser or rpcpassword", self.nodes[0].cli('-rpcuser=%s' % user, '-stdin', '-stdinrpcpass', input="foo").echo)
self.log.info("Compare responses from `bitcoin-cli -getinfo` and the RPCs data is retrieved from.") self.log.info("Compare responses from `dash-cli -getinfo` and the RPCs data is retrieved from.")
cli_get_info = self.nodes[0].cli('-getinfo').help() cli_get_info = self.nodes[0].cli('-getinfo').help()
wallet_info = self.nodes[0].getwalletinfo() wallet_info = self.nodes[0].getwalletinfo()
network_info = self.nodes[0].getnetworkinfo() network_info = self.nodes[0].getnetworkinfo()
@ -45,6 +45,7 @@ class TestBitcoinCli(BitcoinTestFramework):
assert_equal(cli_get_info['protocolversion'], network_info['protocolversion']) assert_equal(cli_get_info['protocolversion'], network_info['protocolversion'])
assert_equal(cli_get_info['walletversion'], wallet_info['walletversion']) assert_equal(cli_get_info['walletversion'], wallet_info['walletversion'])
assert_equal(cli_get_info['balance'], wallet_info['balance']) assert_equal(cli_get_info['balance'], wallet_info['balance'])
assert_equal(cli_get_info['privatesend_balance'], wallet_info['privatesend_balance'])
assert_equal(cli_get_info['blocks'], blockchain_info['blocks']) assert_equal(cli_get_info['blocks'], blockchain_info['blocks'])
assert_equal(cli_get_info['timeoffset'], network_info['timeoffset']) assert_equal(cli_get_info['timeoffset'], network_info['timeoffset'])
assert_equal(cli_get_info['connections'], network_info['connections']) assert_equal(cli_get_info['connections'], network_info['connections'])