Return from test::mine after Client updates its pending block

libethereum/Client.cpp

@@ -122,7 +122,6 @@ void Client::init(p2p::Host& _extNet, fs::path const& _dbPath,
     bc().setOnBlockImport([=](BlockHeader const& _info) {
         if (auto h = m_host.lock())
             h->onBlockImported(_info);
-        m_onBlockImport(_info);
     });
 
     if (_forceAction == WithExisting::Rescue)

libethereum/Client.h

@@ -216,11 +216,6 @@ class Client: public ClientBase, protected Worker
     /// should be called after the constructor of the most derived class finishes.
     void startWorking() { Worker::startWorking(); };
 
-    /// Change the function that is called when a new block is imported
-    Handler<BlockHeader const&> setOnBlockImport(std::function<void(BlockHeader const&)> _handler)
-    {
-        return m_onBlockImport.add(_handler);
-    }
     /// Change the function that is called when a new block is sealed
     Handler<bytes const&> setOnBlockSealed(std::function<void(bytes const&)> _handler)
     {
@@ -375,8 +370,6 @@ class Client: public ClientBase, protected Worker
 
     bytes m_extraData;
 
-    Signal<BlockHeader const&> m_onBlockImport;  ///< Called if we have imported a new block into
-                                                 ///< the DB
     Signal<bytes const&> m_onBlockSealed;        ///< Called if we have sealed a new block
 
     /// Called when blockchain was changed

test/tools/libtesteth/TestHelper.cpp

@@ -53,9 +53,10 @@ void mine(Client& _c, int _numBlocks)
 
     int importedBlocks = 0;
     std::promise<void> allBlocksImported;
-    auto importHandler =
-        _c.setOnBlockImport([_numBlocks, &importedBlocks, &allBlocksImported](BlockHeader const&) {
-            if (++importedBlocks == _numBlocks)
+    auto chainChangedHandler = _c.setOnChainChanged(
+        [_numBlocks, &importedBlocks, &allBlocksImported](h256s const&, h256s const& _newBlocks) {
+            importedBlocks += _newBlocks.size();
+            if (importedBlocks == _numBlocks)
                 allBlocksImported.set_value();
         });