refactor(ldfi2): move makeFaults from tests to ldfi module

src/ldfi2/src/Ldfi.hs

@@ -3,9 +3,11 @@
 
 module Ldfi where
 
+import qualified Data.Map as Map
 import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified GHC.Natural as Nat
+import Text.Read (readMaybe)
 
 import Ldfi.FailureSpec
 import Ldfi.Prop
@@ -38,9 +40,6 @@ lineage ts =
         , j <- drop len vs
         ]
 
-data Fault = Crash Node Time | Omission Edge Time
-  deriving (Eq, Ord, Read, Show)
-
 affects :: Fault -> Event -> Bool
 affects (Omission (f, t) a) (Event f' t' a') = f == f' && t == t' && a == a'
 affects (Crash n a) (Event _ n' a') = n == n' && a <= a'
@@ -107,3 +106,14 @@ run :: Monad m => Storage m -> Solver m -> TestId -> FailureSpec -> m Solution
 run Storage{load} Solver{solve} testId failureSpec = do
   traces <- load testId
   solve (ldfi failureSpec traces)
+
+data Fault = Crash Node Time | Omission Edge Time
+  deriving (Eq, Ord, Read, Show)
+
+makeFaults :: Solution -> [Fault]
+makeFaults NoSolution        = []
+makeFaults (Solution assign) =
+  [ f
+  | (key, True) <- Map.toAscList assign
+  , Just (FaultVar f) <- pure $ readMaybe key
+  ]

src/ldfi2/test/LdfiTest.hs

@@ -1,9 +1,7 @@
 module LdfiTest where
 
-import qualified Data.Map as Map
 import Test.HUnit hiding (Node)
 import qualified Test.QuickCheck as QC
-import Text.Read (readMaybe)
 
 import Ldfi
 import Ldfi.FailureSpec
@@ -83,15 +81,6 @@ unit_cache_lineage =
     (var "A" "B" 0 :&& (var "A" "C" 1 :|| And [var "A" "R" 1, var "R" "S1" 2, var "R" "S2" 3]))
   where
 
--- This should move out of the tests..
-makeFaults :: Solution -> [Fault]
-makeFaults NoSolution        = []
-makeFaults (Solution assign) =
-  [ f
-  | (key, True) <- Map.toAscList assign
-  , Just (FaultVar f) <- pure $ readMaybe key
-  ]
-
 dummyTestId :: TestId
 dummyTestId = error "This testId will never be used."