Allow random seed with specified wallet_propose key_type (RIPD-1030)

This commit is contained in:
wilsonianb
2016-01-19 14:58:30 -08:00
committed by Nik Bougalis
parent 767d253593
commit b92a58d11e
2 changed files with 12 additions and 1 deletions

View File

@@ -56,7 +56,15 @@ Json::Value walletPropose (Json::Value const& params)
if (keyType == KeyType::invalid)
return rpcError(rpcINVALID_PARAMS);
seed = RPC::getSeedFromRPC (params);
if (params.isMember (jss::passphrase) || params.isMember (jss::seed) ||
params.isMember (jss::seed_hex))
{
seed = RPC::getSeedFromRPC (params);
}
else
{
seed = randomSeed ();
}
}
else if (params.isMember (jss::passphrase))
{

View File

@@ -132,6 +132,9 @@ public:
Json::Value params;
params[jss::key_type] = keyType;
expect (! contains_error (walletPropose (params)));
params[jss::passphrase] = common::passphrase;
testSecretWallet (params, strings);