refactor verification code to make sure tests are correctly labeled when the verifiction finishes

Author: gustavo-grieco

lib/Echidna/Campaign.hs

@@ -297,24 +297,26 @@ runSymWorker callback vm dict workerId _ name = do
     -- We can't do callseq vm' [symTx] because callseq might post the full call sequence as an event
     newCoverage <- or <$> mapM (\symTx -> snd <$> callseq vm [symTx]) txs
     let methodSignature = unpack method.methodSignature
-    unless newCoverage ( do
+    unless newCoverage $ do
       unless (null txs) $ error "No new coverage but symbolic execution found valid txs. Something is wrong."
-      updateTests $ \test -> do
-        if isOpen test && isAssertionTest test && getAssertionSignature test == methodSignature then
-              pure $ Just $ test { Test.state = Unsolvable }
-        else
-          pure $ Just test
-      pushWorkerEvent $ SymExecLog ("Symbolic execution finished verifying contract " <> unpack (fromJust name) <> " using a single symbolic transaction."))
-
+      when (null errors && null partials) $ do
+        updateTests $ \test -> do
+          if isOpen test && isAssertionTest test && getAssertionSignature test == methodSignature then
+                pure $ Just $ test { Test.state = Unsolvable }
+          else
+            pure $ Just test
+
+    unless (null errors) $ mapM_ ((pushWorkerEvent . SymExecError) . (\e -> "Error(s) solving constraints produced by method " <> methodSignature <> ": " <> show e)) errors
+    unless (null partials) $ mapM_ ((pushWorkerEvent . SymExecError) . (\e -> "Partial explored path(s) during symbolic verification of method " <> methodSignature <> ": " <> unpack e)) partials
     when (not (null partials) || not (null errors)) $ do
-      unless (null errors) $ mapM_ ((pushWorkerEvent . SymExecError) . (\e -> "Error(s) solving constraints produced by method " <> methodSignature <> ": " <> show e)) errors
-      unless (null partials) $ mapM_ ((pushWorkerEvent . SymExecError) . (\e -> "Partial explored path(s) during symbolic verification of method " <> methodSignature <> ": " <> unpack e)) partials
       updateTests $ \test -> do
         if isOpen test && isAssertionTest test && getAssertionSignature test == methodSignature then
           pure $ Just $ test {Test.state = Passed}
         else
           pure $ Just test
 
+    pushWorkerEvent $ SymExecLog ("Symbolic execution finished verifying contract " <> unpack (fromJust name) <> " using a single symbolic transaction.")
+
 -- | Run a fuzzing campaign given an initial universe state, some tests, and an
 -- optional dictionary to generate calls with. Return the 'Campaign' state once
 -- we can't solve or shrink anything.