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

fix rpc mining

Browse Source
This commit is contained in:
Dimitry 2016-06-13 16:17:56 +03:00 committed by chriseth
parent d6e39054e0
commit 874a16bed4
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/IPCSocket.cpp
View File

@ -148,24 +148,16 @@ void RPCSession::test_mineBlocks(int _number)
u256 startBlock = fromBigEndian<u256>(fromHex(rpcCall("eth_blockNumber").asString())); u256 startBlock = fromBigEndian<u256>(fromHex(rpcCall("eth_blockNumber").asString()));
u256 currentBlock = startBlock; u256 currentBlock = startBlock;
u256 targetBlock = startBlock + _number; u256 targetBlock = startBlock + _number;
cout << "A" << endl;
for (size_t tries = 0; tries < 3 && startBlock < targetBlock; ++tries)
{
if (currentBlock == startBlock)
{
cout << "MINE" << endl; cout << "MINE" << endl;
rpcCall("test_mineBlocks", { (targetBlock - startBlock).str() }, true); rpcCall("test_mineBlocks", { (targetBlock - startBlock).str() }, true);
}
cout << "WOIT" << endl;
startBlock = currentBlock;
//@TODO do not use polling - but that would probably need a change to the test client //@TODO do not use polling - but that would probably need a change to the test client
for (size_t polls = 0; polls < 10; ++polls) for (size_t polls = 0; polls < 100; ++polls)
{ {
currentBlock = fromBigEndian<u256>(fromHex(rpcCall("eth_blockNumber").asString())); currentBlock = fromBigEndian<u256>(fromHex(rpcCall("eth_blockNumber").asString()));
if (currentBlock >= targetBlock) if (currentBlock >= targetBlock)
return; return;
std::this_thread::sleep_for(chrono::milliseconds(1)); std::this_thread::sleep_for(chrono::milliseconds(10)); //it does not work faster then 10 ms
}
} }
} }
@ -194,7 +186,9 @@ Json::Value RPCSession::rpcCall(string const& _methodName, vector<string> const&
{ {
if (_canFail) if (_canFail)
return Json::Value(); return Json::Value();
BOOST_FAIL("Error on JSON-RPC call: " + result["error"].asString());
Json::Value jsonError = result["error"];
BOOST_FAIL("Error on JSON-RPC call: " + jsonError["message"].asString());
} }
return result["result"]; return result["result"];
} }