Merge pull request #538 from tcatm/deprecate-midstate

deprecate midstate and hash1 in getwork
This commit is contained in:
Gavin Andresen 2011-09-29 07:57:22 -07:00
commit e8e0e23d20

View file

@ -1482,9 +1482,9 @@ Value getwork(const Array& params, bool fHelp)
throw runtime_error( throw runtime_error(
"getwork [data]\n" "getwork [data]\n"
"If [data] is not specified, returns formatted hash data to work on:\n" "If [data] is not specified, returns formatted hash data to work on:\n"
" \"midstate\" : precomputed hash state after hashing the first half of the data\n" " \"midstate\" : precomputed hash state after hashing the first half of the data (DEPRECATED)\n" // deprecated
" \"data\" : block data\n" " \"data\" : block data\n"
" \"hash1\" : formatted hash buffer for second hash\n" " \"hash1\" : formatted hash buffer for second hash (DEPRECATED)\n" // deprecated
" \"target\" : little endian hash target\n" " \"target\" : little endian hash target\n"
"If [data] is specified, tries to solve the block and returns true if it was successful."); "If [data] is specified, tries to solve the block and returns true if it was successful.");
@ -1548,9 +1548,9 @@ Value getwork(const Array& params, bool fHelp)
uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256(); uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
Object result; Object result;
result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate)))); result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate)))); // deprecated
result.push_back(Pair("data", HexStr(BEGIN(pdata), END(pdata)))); result.push_back(Pair("data", HexStr(BEGIN(pdata), END(pdata))));
result.push_back(Pair("hash1", HexStr(BEGIN(phash1), END(phash1)))); result.push_back(Pair("hash1", HexStr(BEGIN(phash1), END(phash1)))); // deprecated
result.push_back(Pair("target", HexStr(BEGIN(hashTarget), END(hashTarget)))); result.push_back(Pair("target", HexStr(BEGIN(hashTarget), END(hashTarget))));
return result; return result;
} }