From fa86a4bbfc000593ae4ad9dcdaec3fd0c0406086 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 12 Apr 2020 17:02:22 -0400 Subject: rpc: Rename first arg of generateblock RPC to "output" --- test/functional/rpc_generateblock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/functional/rpc_generateblock.py b/test/functional/rpc_generateblock.py index f23d9ec556..5298f385ba 100755 --- a/test/functional/rpc_generateblock.py +++ b/test/functional/rpc_generateblock.py @@ -23,7 +23,7 @@ class GenerateBlockTest(BitcoinTestFramework): self.log.info('Generate an empty block to address') address = node.getnewaddress() - hash = node.generateblock(address, [])['hash'] + hash = node.generateblock(output=address, transactions=[])['hash'] block = node.getblock(hash, 2) assert_equal(len(block['tx']), 1) assert_equal(block['tx'][0]['vout'][0]['scriptPubKey']['addresses'][0], address) -- cgit v1.2.3 From fa5b1f067fcf8bebb23455dd8a16cde5068e79cd Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 12 Apr 2020 17:09:23 -0400 Subject: rpc: Document all aliases for second arg of getblock --- test/functional/rpc_generateblock.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/functional/rpc_generateblock.py b/test/functional/rpc_generateblock.py index 5298f385ba..aa58c0af9d 100755 --- a/test/functional/rpc_generateblock.py +++ b/test/functional/rpc_generateblock.py @@ -11,6 +11,7 @@ from test_framework.util import ( assert_raises_rpc_error, ) + class GenerateBlockTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 @@ -24,13 +25,13 @@ class GenerateBlockTest(BitcoinTestFramework): self.log.info('Generate an empty block to address') address = node.getnewaddress() hash = node.generateblock(output=address, transactions=[])['hash'] - block = node.getblock(hash, 2) + block = node.getblock(blockhash=hash, verbose=2) assert_equal(len(block['tx']), 1) assert_equal(block['tx'][0]['vout'][0]['scriptPubKey']['addresses'][0], address) self.log.info('Generate an empty block to a descriptor') hash = node.generateblock('addr(' + address + ')', [])['hash'] - block = node.getblock(hash, 2) + block = node.getblock(blockhash=hash, verbosity=2) assert_equal(len(block['tx']), 1) assert_equal(block['tx'][0]['vout'][0]['scriptPubKey']['addresses'][0], address) -- cgit v1.2.3 From fa168d754221a83cab0d2984a02c41cf6819e873 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 12 Apr 2020 17:12:32 -0400 Subject: rpc: Document all aliases for first arg of listtransactions --- test/functional/wallet_listtransactions.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test') diff --git a/test/functional/wallet_listtransactions.py b/test/functional/wallet_listtransactions.py index 8c44a070b8..8ff663ccd2 100755 --- a/test/functional/wallet_listtransactions.py +++ b/test/functional/wallet_listtransactions.py @@ -97,6 +97,8 @@ class ListTransactionsTest(BitcoinTestFramework): txid = self.nodes[1].sendtoaddress(multisig["address"], 0.1) self.nodes[1].generate(1) self.sync_all() + assert_equal(len(self.nodes[0].listtransactions(label="watchonly", include_watchonly=True)), 1) + assert_equal(len(self.nodes[0].listtransactions(dummy="watchonly", include_watchonly=True)), 1) assert len(self.nodes[0].listtransactions(label="watchonly", count=100, include_watchonly=False)) == 0 assert_array_result(self.nodes[0].listtransactions(label="watchonly", count=100, include_watchonly=True), {"category": "receive", "amount": Decimal("0.1")}, -- cgit v1.2.3