cerc-io/solidity
16
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

style

Browse Source
This commit is contained in:
Dimitry 2016-06-13 17:02:58 +03:00 committed by chriseth
parent 874a16bed4
commit 603bad34f9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/IPCSocket.cpp
View File

@ -144,12 +144,10 @@ void RPCSession::test_rewindToBlock(size_t _blockNr)
void RPCSession::test_mineBlocks(int _number) void RPCSession::test_mineBlocks(int _number)
{ {
// Extremely complicated mechanism because sometimes the miner breaks and stops mining.
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 << "MINE" << endl; rpcCall("test_mineBlocks", { to_string(_number) }, true);
rpcCall("test_mineBlocks", { (targetBlock - startBlock).str() }, true);
//@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 < 100; ++polls) for (size_t polls = 0; polls < 100; ++polls)
@ -159,6 +157,8 @@ void RPCSession::test_mineBlocks(int _number)
return; return;
std::this_thread::sleep_for(chrono::milliseconds(10)); //it does not work faster then 10 ms std::this_thread::sleep_for(chrono::milliseconds(10)); //it does not work faster then 10 ms
} }
BOOST_FAIL("Error in test_mineBlocks: block mining timeout!");
} }
Json::Value RPCSession::rpcCall(string const& _methodName, vector<string> const& _args, bool _canFail) Json::Value RPCSession::rpcCall(string const& _methodName, vector<string> const& _args, bool _canFail)
@ -187,8 +187,7 @@ Json::Value RPCSession::rpcCall(string const& _methodName, vector<string> const&
if (_canFail) if (_canFail)
return Json::Value(); return Json::Value();
Json::Value jsonError = result["error"]; BOOST_FAIL("Error on JSON-RPC call: " + result["error"]["message"].asString());
BOOST_FAIL("Error on JSON-RPC call: " + jsonError["message"].asString());
} }
return result["result"]; return result["result"];
} }