Merge 51c4ebb into merged_master (Elements PR ElementsProject#706)

Author: apoelstra

src/wallet/rpcwallet.cpp

@@ -5214,7 +5214,7 @@ UniValue sendtomainchain_pak(const JSONRPCRequest& request)
     //amount
     CAmount nAmount = AmountFromValue(request.params[1]);
     if (nAmount < 100000)
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid amount for send, must send more than 0.0001 BTC");
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid amount for send, must send more than 0.00100000 BTC");
 
     bool subtract_fee = false;
     if (request.params.size() > 2) {

test/functional/feature_pak.py

@@ -145,7 +145,7 @@ def run_test(self):
         self.log.info("Test various RPC arguments")
 
         # Fail to peg-out too-small value
-        assert_raises_rpc_error(-8, "Invalid amount for send, must send more than 0.0001 BTC", self.nodes[1].sendtomainchain, "", Decimal('0.0009'))
+        assert_raises_rpc_error(-8, "Invalid amount for send, must send more than 0.00100000 BTC", self.nodes[1].sendtomainchain, "", Decimal('0.0009'))
 
         # Use wrong network's extended pubkey
         mainnetxpub = "xpub6AATBi58516uxLogbuaG3jkom7x1qyDoZzMN2AePBuQnMFKUV9xC2BW9vXsFJ9rELsvbeGQcFWhtbyM4qDeijM22u3AaSiSYEvuMZkJqtLn"