cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use maxMiningTime in mining as opposed to poll counter

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-02-13 13:59:29 +00:00
parent 0d8a9c3289
commit 1d4ef87bb1
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/RPCSession.cpp
View File

@ -248,22 +248,26 @@ void RPCSession::test_mineBlocks(int _number)
// We auto-calibrate the time it takes to mine the transaction. // We auto-calibrate the time it takes to mine the transaction.
// It would be better to go without polling, but that would probably need a change to the test client // It would be better to go without polling, but that would probably need a change to the test client
unsigned startTime = boost::posix_time::microsec_clock::local_time();
unsigned sleepTime = m_sleepTime; unsigned sleepTime = m_sleepTime;
size_t polls = 0; size_t tries = 0;
for (; polls < 14 && !mined; ++polls) for (; !mined; ++tries)
{ {
std::this_thread::sleep_for(chrono::milliseconds(sleepTime)); std::this_thread::sleep_for(chrono::milliseconds(sleepTime));
boost::posix_time::time_duration timeSpent = boost::posix_time::microsec_clock::local_time() - startTime;
if (timeSpent > m_maxMiningTime)
break;
if (fromBigEndian<u256>(fromHex(rpcCall("eth_blockNumber").asString())) >= startBlock + _number) if (fromBigEndian<u256>(fromHex(rpcCall("eth_blockNumber").asString())) >= startBlock + _number)
mined = true; mined = true;
else else
sleepTime *= 2; sleepTime *= 2;
} }
if (polls > 1) if (tries > 1)
{ {
m_successfulMineRuns = 0; m_successfulMineRuns = 0;
m_sleepTime += 2; m_sleepTime += 2;
} }
else if (polls == 1) else if (tries == 1)
{ {
m_successfulMineRuns++; m_successfulMineRuns++;
if (m_successfulMineRuns > 5) if (m_successfulMineRuns > 5)

1
test/RPCSession.h
View File

@ -126,6 +126,7 @@ private:
IPCSocket m_ipcSocket; IPCSocket m_ipcSocket;
size_t m_rpcSequence = 1; size_t m_rpcSequence = 1;
unsigned m_maxMiningTime = 15000; // 15 seconds
unsigned m_sleepTime = 10; unsigned m_sleepTime = 10;
unsigned m_successfulMineRuns = 0; unsigned m_successfulMineRuns = 0;