Auto merge of #1586 - bitcartel:z_sendmany_amount_too_strict, r=daira
Fix issue where z_sendmany amount parameter is too strict Upstream treats an amount parameter of `1` the same as `1.0`. Third-party would like this fixed.
This commit is contained in:
commit
71043784dd
|
@ -240,7 +240,7 @@ class WalletTest (BitcoinTestFramework):
|
||||||
|
|
||||||
# send node 2 taddr to zaddr
|
# send node 2 taddr to zaddr
|
||||||
recipients = []
|
recipients = []
|
||||||
recipients.append({"address":myzaddr, "amount":7.0})
|
recipients.append({"address":myzaddr, "amount":7})
|
||||||
myopid = self.nodes[2].z_sendmany(mytaddr, recipients)
|
myopid = self.nodes[2].z_sendmany(mytaddr, recipients)
|
||||||
|
|
||||||
opids = []
|
opids = []
|
||||||
|
@ -288,7 +288,7 @@ class WalletTest (BitcoinTestFramework):
|
||||||
node2balance = self.nodes[2].getbalance() # 16.99790000
|
node2balance = self.nodes[2].getbalance() # 16.99790000
|
||||||
|
|
||||||
recipients = []
|
recipients = []
|
||||||
recipients.append({"address":self.nodes[0].getnewaddress(), "amount":1.0})
|
recipients.append({"address":self.nodes[0].getnewaddress(), "amount":1})
|
||||||
recipients.append({"address":self.nodes[2].getnewaddress(), "amount":1.0})
|
recipients.append({"address":self.nodes[2].getnewaddress(), "amount":1.0})
|
||||||
myopid = self.nodes[2].z_sendmany(myzaddr, recipients)
|
myopid = self.nodes[2].z_sendmany(myzaddr, recipients)
|
||||||
|
|
||||||
|
|
|
@ -3233,8 +3233,6 @@ Value z_sendmany(const Array& params, bool fHelp)
|
||||||
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected object");
|
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected object");
|
||||||
const Object& o = output.get_obj();
|
const Object& o = output.get_obj();
|
||||||
|
|
||||||
RPCTypeCheck(o, boost::assign::map_list_of("address", str_type)("amount", real_type));
|
|
||||||
|
|
||||||
// sanity check, report error if unknown key-value pairs
|
// sanity check, report error if unknown key-value pairs
|
||||||
for (const Pair& p : o) {
|
for (const Pair& p : o) {
|
||||||
std::string s = p.name_;
|
std::string s = p.name_;
|
||||||
|
|
Loading…
Reference in New Issue