diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-27 14:11:56 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-27 14:22:42 +0200 |
| commit | 240b30eaf0b94a0094b8943dd9c01448bc29c3ba (patch) | |
| tree | 33746478cdca8fbb0523c864f8e51c8ab29dcf4e /src | |
| parent | d43297c5ba951df535df704e321a883f97475c35 (diff) | |
| parent | 9127e9766a7e8e9173ba9dacc551edaa9e243f4c (diff) | |
| download | bitcoin-240b30eaf0b94a0094b8943dd9c01448bc29c3ba.tar.xz | |
Merge pull request #6380
9127e97 doc: Mention RPC strings for monetary amounts in release notes (Wladimir J. van der Laan)
7d226b7 [QA] add testcases for parsing strings as values (Jonas Schnelli)
614601b rpc: Accept strings in AmountFromValue (Wladimir J. van der Laan)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpcserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 201fc5eba8..03c123a361 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -120,8 +120,8 @@ void RPCTypeCheckObj(const UniValue& o, CAmount AmountFromValue(const UniValue& value) { - if (!value.isNum()) - throw JSONRPCError(RPC_TYPE_ERROR, "Amount is not a number"); + if (!value.isNum() && !value.isStr()) + throw JSONRPCError(RPC_TYPE_ERROR, "Amount is not a number or string"); CAmount amount; if (!ParseFixedPoint(value.getValStr(), 8, &amount)) throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount"); |