diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-08-24 19:21:27 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-08-26 11:30:25 +0200 |
| commit | 526d2b0472356a185bda316ab424e914ba56d9be (patch) | |
| tree | 107e6b9a5248ba7919649f80701f45f3bf9ad681 /src/wallet | |
| parent | f2306fbe01426ce11c4df6a5c1b837106bc2c702 (diff) | |
| download | bitcoin-526d2b0472356a185bda316ab424e914ba56d9be.tar.xz | |
[wallet] rpc: Drop misleading option
Github-Pull: #8581
Rebased-From: fab5ecb7719063aa72751df1258dfa4cf4a9a4a9
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/rpcdump.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 6647d3297f..443441a36a 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -257,6 +257,7 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp) if (!EnsureWalletIsAvailable(fHelp)) return NullUniValue; + // 0.13.x: Silently accept up to 3 params, but ignore the third: if (fHelp || params.size() < 2 || params.size() > 3) throw runtime_error( "importprunedfunds\n" @@ -264,7 +265,6 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp) "\nArguments:\n" "1. \"rawtransaction\" (string, required) A raw transaction in hex funding an already-existing address in wallet\n" "2. \"txoutproof\" (string, required) The hex output from gettxoutproof that contains the transaction\n" - "3. \"label\" (string, optional) An optional label\n" ); CTransaction tx; @@ -277,10 +277,6 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp) CMerkleBlock merkleBlock; ssMB >> merkleBlock; - string strLabel = ""; - if (params.size() == 3) - strLabel = params[2].get_str(); - //Search partial merkle tree in proof for our transaction and index in valid block vector<uint256> vMatch; vector<unsigned int> vIndex; |