diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-09-12 19:31:23 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-09-12 19:31:30 +0200 |
| commit | c377feaad87f8109f85da6caf62602b30c20effc (patch) | |
| tree | 48007b5c53c2d207e386605366e5c33d81dfeb36 /src/rpc | |
| parent | b37cab65c63e051ebc5b491da9bd687581df94df (diff) | |
| parent | 5acd82de9ad6df8cab922da66d49b8ff2bd35439 (diff) | |
| download | bitcoin-c377feaad87f8109f85da6caf62602b30c20effc.tar.xz | |
Merge #11267: rpc: update cli for estimate*fee argument rename
5acd82de9 rpc: make estimatesmartfee argument naming consistent with documentation (Wladimir J. van der Laan)
24697c40e rpc: update cli for estimatefee argument rename (Wladimir J. van der Laan)
Pull request description:
The first argument of `estimaterawfee` was renamed from `nblocks` to `conf_target` in 06bcdb8da64502a64df03f3c89fbc6ccb72cd349. Update the client-side table as well.
This makes #10753 pass again.
Tree-SHA512: 107c0072a45e0f4e083dc803d534973e6bd4c005e62337a867815d7c98ab1c21d97b7a495c32763883975cbbb001b80003001a6709b7d9bdd81ce4d441b667be
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/client.cpp | 4 | ||||
| -rw-r--r-- | src/rpc/mining.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 4179453782..406ad2f6ec 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -115,8 +115,8 @@ static const CRPCConvertParam vRPCConvertParams[] = { "keypoolrefill", 0, "newsize" }, { "getrawmempool", 0, "verbose" }, { "estimatefee", 0, "nblocks" }, - { "estimatesmartfee", 0, "nblocks" }, - { "estimaterawfee", 0, "nblocks" }, + { "estimatesmartfee", 0, "conf_target" }, + { "estimaterawfee", 0, "conf_target" }, { "estimaterawfee", 1, "threshold" }, { "prioritisetransaction", 1, "dummy" }, { "prioritisetransaction", 2, "fee_delta" }, diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index c54dc74070..f0ffa07e12 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -978,7 +978,7 @@ static const CRPCCommand commands[] = { "generating", "generatetoaddress", &generatetoaddress, {"nblocks","address","maxtries"} }, { "util", "estimatefee", &estimatefee, {"nblocks"} }, - { "util", "estimatesmartfee", &estimatesmartfee, {"nblocks", "estimate_mode"} }, + { "util", "estimatesmartfee", &estimatesmartfee, {"conf_target", "estimate_mode"} }, { "hidden", "estimaterawfee", &estimaterawfee, {"conf_target", "threshold"} }, }; |