diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-10-23 19:03:45 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-10-23 19:04:10 -0400 |
| commit | 94cf1ec94821f88515be9a199b3b31040889247b (patch) | |
| tree | fd69897ec3b17c7cd16349c4ba979dc8343eaf66 | |
| parent | 3668bb335c6ae08614057bf0c9f6515687eec007 (diff) | |
| parent | d4d70eda339f6f74390b56edd4021e928bb588a7 (diff) | |
Merge #14417: Fix listreceivedbyaddress not taking address as a string
d4d70eda33 Fix listreceivedbyaddress not taking address as a string (Eric Scrivner)
Pull request description:
Fixes #14173. Add the patch in #14173 and include a regression test.
Tree-SHA512: 5a9794e0c43e90d18c899841afbaf15eb9129d7d2f6570fccf0a1793697fe170d224c3c3995b1a35c536fac19819042823d9e3bd23b019d0f03434499243d2f5
| -rw-r--r-- | src/rpc/client.cpp | 1 | ||||
| -rwxr-xr-x | test/functional/wallet_listreceivedby.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 649e222c39..2bf6aa3b76 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -45,7 +45,6 @@ static const CRPCConvertParam vRPCConvertParams[] = { "listreceivedbyaddress", 0, "minconf" }, { "listreceivedbyaddress", 1, "include_empty" }, { "listreceivedbyaddress", 2, "include_watchonly" }, - { "listreceivedbyaddress", 3, "address_filter" }, { "listreceivedbylabel", 0, "minconf" }, { "listreceivedbylabel", 1, "include_empty" }, { "listreceivedbylabel", 2, "include_watchonly" }, diff --git a/test/functional/wallet_listreceivedby.py b/test/functional/wallet_listreceivedby.py index 3485c4470f..9e8667c600 100755 --- a/test/functional/wallet_listreceivedby.py +++ b/test/functional/wallet_listreceivedby.py @@ -68,6 +68,10 @@ class ReceivedByTest(BitcoinTestFramework): res = self.nodes[1].listreceivedbyaddress(minconf=0, include_empty=True, include_watchonly=True, address_filter=addr) assert_array_result(res, {"address": addr}, expected) assert_equal(len(res), 1) + # Test for regression on CLI calls with address string (#14173) + cli_res = self.nodes[1].cli.listreceivedbyaddress(0, True, True, addr) + assert_array_result(cli_res, {"address": addr}, expected) + assert_equal(len(cli_res), 1) # Error on invalid address assert_raises_rpc_error(-4, "address_filter parameter was invalid", self.nodes[1].listreceivedbyaddress, minconf=0, include_empty=True, include_watchonly=True, address_filter="bamboozling") # Another address receive money |