Merge pull request #34 from input-output-hk/dcoutts/main-fixes

Fix some minor issues on main
IntersectMBO · Nov 9, 2023 · 106f9c6 · 106f9c6
2 parents e162808 + 921aaa9
commit 106f9c6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/prototypes/ScheduledMerges.hs b/prototypes/ScheduledMerges.hs
@@ -42,19 +42,19 @@ module ScheduledMerges (
     EventDetail(..)
   ) where
 
-import Prelude hiding (lookup)
+import           Prelude hiding (lookup)
 
 import           Data.Bits
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import           Data.STRef
 
-import Control.Exception (assert)
-import Control.Monad.ST
-import Control.Tracer    (Tracer, contramap, traceWith)
-import GHC.Stack         (HasCallStack)
+import           Control.Exception (assert)
+import           Control.Monad.ST
+import           Control.Tracer (Tracer, contramap, traceWith)
+import           GHC.Stack (HasCallStack)
 
-import Database.LSMTree.Normal (LookupResult (..), Update (..))
+import           Database.LSMTree.Normal (LookupResult (..), Update (..))
 
 
 data LSM s  = LSMHandle !(STRef s Counter)
@@ -415,7 +415,7 @@ lookups lsm = mapM (lookup lsm)
 
 lookup :: LSM s -> Key -> ST s (LookupResult Key Value Blob)
 lookup lsm k = do
-    rs <- allLayers lsm
+    rss <- allLayers lsm
     return $!
       foldr (\lookures continue ->
               case lookures of
@@ -424,7 +424,7 @@ lookup lsm k = do
                 Just (Insert v (Just b)) -> FoundWithBlob k v b
                 Just  Delete             -> NotFound k)
             (NotFound k)
-            [ Map.lookup k r | r <- rs ]
+            [ Map.lookup k r | rs <- rss, r <- rs ]
 
 bufferToRun :: Buffer -> Run
 bufferToRun = id

diff --git a/prototypes/ScheduledMergesTestQLS.hs b/prototypes/ScheduledMergesTestQLS.hs
@@ -9,26 +9,26 @@
 
 module ScheduledMergesTestQLS (tests) where
 
-import Prelude hiding (lookup)
+import           Prelude hiding (lookup)
 
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 
-import Data.Constraint (Dict (..))
-import Data.Proxy
+import           Data.Constraint (Dict (..))
+import           Data.Proxy
 
-import Control.Monad.ST
-import Control.Tracer   (Tracer, nullTracer)
+import           Control.Monad.ST
+import           Control.Tracer (Tracer, nullTracer)
 
-import ScheduledMerges
+import           ScheduledMerges
 
 import           Test.QuickCheck
-import           Test.QuickCheck.StateModel                   hiding (lookUpVar)
-import           Test.QuickCheck.StateModel.Lockstep          hiding (ModelOp)
+import           Test.QuickCheck.StateModel hiding (lookUpVar)
+import           Test.QuickCheck.StateModel.Lockstep hiding (ModelOp)
 import qualified Test.QuickCheck.StateModel.Lockstep.Defaults as Lockstep
-import qualified Test.QuickCheck.StateModel.Lockstep.Run      as Lockstep
+import qualified Test.QuickCheck.StateModel.Lockstep.Run as Lockstep
 import           Test.Tasty
-import           Test.Tasty.QuickCheck                        (testProperty)
+import           Test.Tasty.QuickCheck (testProperty)
 
 
 -------------------------------------------------------------------------------

diff --git a/prototypes/Test.hs b/prototypes/Test.hs
@@ -1,6 +1,6 @@
 module Main (main) where
 
-import Test.Tasty
+import           Test.Tasty
 
 import qualified ScheduledMergesTestQLS