[wallet] rpc: Drop misleading option

Github-Pull: #8581
Rebased-From: fab5ecb7719063aa72751df1258dfa4cf4a9a4a9
This commit is contained in:
MarcoFalke
2016-08-24 19:21:27 +02:00
parent f2306fbe01
commit 526d2b0472
3 changed files with 23 additions and 28 deletions

View File

@@ -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;