SKALE-3135 shutdown Skale Host inside Ethereum Client early as possible

skalenetwork · Aug 28, 2020 · 56e2873 · 56e2873
1 parent 8d6b1e5
commit 56e2873
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp
@@ -125,8 +125,11 @@ Client::~Client() {
 void Client::stopWorking() {
     Worker::stopWorking();
 
-    if ( m_snapshotHashComputing != nullptr )
-        m_snapshotHashComputing->join();
+    if ( m_skaleHost )
+        m_skaleHost->stopWorking();  // TODO Find and document a systematic way to sart/stop all
+                                     // workers
+    else
+        cerror << "Instance of SkaleHost was not properly created.";
 
     if ( m_snapshotHashComputing != nullptr ) {
         try {
@@ -139,12 +142,6 @@ void Client::stopWorking() {
     m_new_block_watch.uninstallAll();
     m_new_pending_transaction_watch.uninstallAll();
 
-    if ( m_skaleHost )
-        m_skaleHost->stopWorking();  // TODO Find and document a systematic way to sart/stop all
-                                     // workers
-    else
-        cerror << "Instance of SkaleHost was not properly created.";
-
     m_signalled.notify_all();  // to wake up the thread from Client::doWork()
 
     m_tq.HandleDestruction();  // l_sergiy: destroy transaction queue earlier