Merge pull request #3581 from ethereum/fix-test-mining

Fix mining in solidity tests using test.mineBlocks

Author: chriseth

libethereum/BlockChainSync.h

@@ -58,6 +58,10 @@ class BlockChainSync: public HasInvariants
 	/// Restart sync
 	void restartSync();
 
+	/// Called after all blocks have been downloaded
+	/// Public only for test mode
+	void completeSync();
+
 	/// Called by peer to report status
 	void onPeerStatus(std::shared_ptr<EthereumPeer> _peer);
 
@@ -84,9 +88,6 @@ class BlockChainSync: public HasInvariants
 	/// Resume downloading after witing state
 	void continueSync();
 
-	/// Called after all blocks have been donloaded
-	void completeSync();
-
 	/// Enter waiting state
 	void pauseSync();
 

libethereum/ClientTest.cpp

@@ -116,3 +116,13 @@ void ClientTest::onNewBlocks(h256s const& _blocks, h256Hash& io_changed)
 	if(--m_blocksToMine <= 0)
 		stopSealing();
 }
+
+bool ClientTest::completeSync()
+{
+	auto h = m_host.lock();
+	if (!h)
+		return false;
+
+	h->completeSync();
+	return true;
+}

libethereum/ClientTest.h

@@ -51,6 +51,7 @@ class ClientTest: public Client
 	void modifyTimestamp(u256 const& _timestamp);
 	void rewindToBlock(unsigned _number);
 	bool addBlock(std::string const& _rlp);
+	bool completeSync();
 
 protected:
 	unsigned m_blocksToMine;

libethereum/EthereumHost.cpp

@@ -421,6 +421,12 @@ void EthereumHost::reset()
 	m_transactionsSent.clear();
 }
 
+void EthereumHost::completeSync()
+{
+	RecursiveGuard l(x_sync);
+	m_sync->completeSync();
+}
+
 void EthereumHost::doWork()
 {
 	bool netChange = ensureInitialised();

libethereum/EthereumHost.h

@@ -70,6 +70,8 @@ class EthereumHost: public p2p::HostCapability<EthereumPeer>, Worker
 	void setNetworkId(u256 _n) { m_networkId = _n; }
 
 	void reset();
+	/// Don't sync further - used only in test mode
+	void completeSync();
 
 	bool isSyncing() const;
 	bool isBanned(p2p::NodeID const& _id) const { return !!m_banned.count(_id); }

libweb3jsonrpc/Test.cpp

@@ -94,6 +94,7 @@ bool Test::test_rewindToBlock(int _number)
 	try
 	{
 		m_eth.rewind(_number);
+		asClientTest(m_eth).completeSync();
 	}
 	catch (std::exception const&)
 	{