From 214e50f42f1008d21b4b547efa2b50ee5ceaecea Mon Sep 17 00:00:00 2001 From: svost Date: Thu, 26 Jan 2017 14:38:06 +0300 Subject: [PATCH] Cleanup rpcmining.cpp --- src/rpcmining.cpp | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 9092655..082c440 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -292,13 +292,13 @@ Value getworkex(const Array& params, bool fHelp) char phash1[64]; FormatHashBuffers(pblock, pmidstate, pdata, phash1); - auto hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256(); + auto hashTarget = uint256().SetCompact(pblock->nBits); auto coinbaseTx = pblock->vtx[0]; auto merkle = pblock->GetMerkleBranch(0); Object result; - result.push_back(Pair("data", HexStr(BEGIN(pdata), END(pdata)))); + result.push_back(Pair("data", HexStr(begin(pdata), end(pdata)))); result.push_back(Pair("target", HexStr(hashTarget.begin(), hashTarget.end()))); CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); @@ -431,12 +431,12 @@ Value getwork(const Array& params, bool fHelp) char phash1[64]; FormatHashBuffers(pblock, pmidstate, pdata, phash1); - auto hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256(); + auto hashTarget = uint256().SetCompact(pblock->nBits); Object result; - 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("hash1", HexStr(BEGIN(phash1), END(phash1)))); // deprecated + 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("hash1", HexStr(begin(phash1), end(phash1)))); // deprecated result.push_back(Pair("target", HexStr(hashTarget.begin(), hashTarget.end()))); return result; } @@ -595,7 +595,7 @@ Value getblocktemplate(const Array& params, bool fHelp) Object aux; aux.push_back(Pair("flags", HexStr(COINBASE_FLAGS.begin(), COINBASE_FLAGS.end()))); - auto hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256(); + auto hashTarget = uint256().SetCompact(pblock->nBits); static Array aMutable; if (aMutable.empty()) -- 1.7.1