From d1ca56382512df3084fce7353bf1e8b66cae61bc Mon Sep 17 00:00:00 2001 From: Ryan Ofsky Date: Fri, 2 Dec 2022 17:53:58 -0500 Subject: bitcoin-cli: Make it an error to specify the "args" parameter two different ways MarcoFalke reported the case of positional arguments silently overwriting the named "args" parameter in bitcoin-cli https://github.com/bitcoin/bitcoin/pull/19762#discussion_r1035761471 and this behavior is confusing and was not intended when support for "args" parameters was added to bitcoin-cli in #19762. Instead of letting one "args" value overwrite the other in the client, just pass the values to the server verbatim, and let the error be handled server side. --- test/functional/interface_bitcoin_cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/functional/interface_bitcoin_cli.py') diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py index afba8dba85..90a543b51b 100755 --- a/test/functional/interface_bitcoin_cli.py +++ b/test/functional/interface_bitcoin_cli.py @@ -92,7 +92,7 @@ class TestBitcoinCli(BitcoinTestFramework): self.log.info("Test that later cli named arguments values silently overwrite earlier ones") assert_equal(self.nodes[0].cli("-named", "echo", "arg0=0", "arg1=1", "arg2=2", "arg1=3").send_cli(), ['0', '3', '2']) - assert_equal(self.nodes[0].cli("-named", "echo", "args=[0,1,2,3]", "4", "5", "6", ).send_cli(), ['4', '5', '6']) + assert_raises_rpc_error(-8, "Parameter args specified multiple times", self.nodes[0].cli("-named", "echo", "args=[0,1,2,3]", "4", "5", "6", ).send_cli) user, password = get_auth_cookie(self.nodes[0].datadir, self.chain) -- cgit v1.2.3