Merge pull request #1411 from crytic/faster-saving

Speed up coverage filename calculation

Author: elopez

lib/Echidna/Output/Corpus.hs

@@ -23,9 +23,10 @@ saveTxs :: Env -> FilePath -> [[Tx]] -> IO ()
 saveTxs env dir = mapM_ saveTxSeq where
   saveTxSeq txSeq = do
     createDirectoryIfMissing True dir
-    let file = dir </> (show . abs . hash . show) txSeq <.> "txt"
-    unlessM (doesFileExist file) $ encodeFile file (toJSON txSeq)
-    pushCampaignEvent env (ReproducerSaved file)
+    let file = dir </> (show . abs . hash) txSeq <.> "txt"
+    unlessM (doesFileExist file) $ do
+      encodeFile file (toJSON txSeq)
+      pushCampaignEvent env (ReproducerSaved file)
 
 loadTxs :: FilePath -> IO [(FilePath, [Tx])]
 loadTxs dir = do

lib/Echidna/Types/Tx.hs

@@ -14,7 +14,9 @@ import Data.Aeson (FromJSON, ToJSON, parseJSON, toJSON, object, withObject, (.=)
 import Data.Aeson.TH (deriveJSON, defaultOptions)
 import Data.Aeson.Types (Parser)
 import Data.ByteString (ByteString)
+import Data.Hashable (Hashable(..))
 import Data.Text (Text)
+import Data.Vector (Vector, toList)
 import Data.Word (Word64)
 
 import EVM.ABI (encodeAbiValue, AbiValue(..), AbiType)
@@ -67,6 +69,16 @@ data Tx = Tx
   , delay :: !(W256, W256) -- ^ (Time, # of blocks since last call)
   } deriving (Eq, Ord, Show, Generic)
 
+instance Hashable a => Hashable (Vector a) where
+  hashWithSalt s v = s `hashWithSalt` toList v
+
+deriving instance Hashable Tx
+deriving instance Hashable TxCall
+deriving instance Hashable AbiValue
+deriving instance Hashable AbiType
+deriving anyclass instance Hashable Addr
+deriving anyclass instance Hashable W256
+
 deriving instance NFData Tx
 deriving instance NFData TxCall
 deriving instance NFData AbiValue

src/Main.hs

@@ -93,7 +93,7 @@ main = withUtf8 $ withCP65001 $ do
                 (results, finalVM) <- reproduceTest vm test
                 let subdir = dir </> "reproducers-traces"
                 liftIO $ createDirectoryIfMissing True subdir
-                let file = subdir </> (show . abs . hash . show) test.reproducer <.> "txt"
+                let file = subdir </> (show . abs . hash) test.reproducer <.> "txt"
                 txsPrinted <- ppFailWithTraces Nothing finalVM results
                 liftIO $ writeFile file (ppTestName test <> ": " <> txsPrinted)