clean up lists and mvars

perprop/Main.hs

@@ -9,7 +9,7 @@ import Control.Monad           (forM, forM_, replicateM_)
 import Control.Monad.Catch     (MonadThrow(..))
 import Control.Monad.Identity  (Identity(..))
 import Control.Monad.Reader    (runReaderT)
-import Data.List               (foldl')
+import Data.List               ((\\), foldl')
 import Data.Semigroup          ((<>))
 import Data.Set                (unions)
 import Data.Text               (Text, unpack, pack)
@@ -110,7 +110,7 @@ readConf :: FilePath -> IO (Maybe (Config, [Property]))
 readConf f = decodeEither <$> BS.readFile f >>= \case
   Left e -> putStrLn ("couldn't parse config, " ++ e) >> pure Nothing
   Right (PerPropConf t s p) -> pure . Just . (,p) $
-    defaultConfig & addrList .~ Just (view address <$> s) & range .~ t & epochs .~ 1 & outputJson .~ True
+    defaultConfig & addrList ?~ (view address <$> s) & range .~ t & epochs .~ 1 & outputJson .~ True
 
 group :: String
       -> Config
@@ -136,16 +136,12 @@ main = do
     (Just (c, ps)) -> do
       if null ps then throwM NoTests else pure ()
       (v,a,t) <- runReaderT (loadSolidity file (pack <$> contract)) c
-      forM_ (map (view function) ps) $ \p -> if p `elem` (t ++ map fst a)
-        then pure ()
-        else warn $ "Warning: property " ++ unpack p ++ " not found in ABI"
-      tests <- mapM (\p -> fmap (p,) (newMVar [])) $ filter (\p -> (view function p) `elem` (t ++ map fst a)) ps
+      let abi = t ++ map fst a
+      forM_ ((view function <$> ps) \\ abi) $ \p ->
+        warn $ "Warning: property " ++ unpack p ++ " not found in ABI"
+      tests <- mapM ((<$> newMVar []) . (,)) [ p | p <- ps, p ^. function `elem` abi ]
       replicateM_ (c ^. epochs) $ do
-        xs <- forM tests $ \(p,mvar) -> do
-          cov     <- readMVar mvar
-          _       <- swapMVar mvar []
-          pure (p, getCover cov, mvar)
-
+        xs <- forM tests $ \(p,mvar) -> swapMVar mvar [] <&> (p,, mvar) . getCover
         checkParallelJson $ group file c a v xs
 
       ls <- mapM (readMVar . snd) tests

src/Main.hs

@@ -78,11 +78,7 @@ main = do
             ePropertySeqCoverage cov mvar (`f` t) a v >>= \x -> return (PropertyName $ show t, x)
 
       replicateM_ (config ^. epochs) $ do
-        xs <- liftIO $ forM tests $ \(x,y) -> do
-          cov <- readMVar y
-          _ <- swapMVar y []
-          return (getCover cov, x, y)
-
+        xs <- liftIO $ forM tests $ \(x,y) -> swapMVar y [] <&> (, x, y) . getCover
         checkGroup . Group (GroupName file) =<< mapM prop xs
         
       ls <- liftIO $ mapM (readMVar . snd) tests