refactor(sut): rename modules for journaling dumblog

src/journal/test/JournalTest.hs

@@ -863,7 +863,6 @@ interleavings (History ops) =
     filter1 p (x : xs) | p x       = x : filter1 p xs
                        | otherwise = xs
 
-
 -- If any one of the single-threaded executions respects the state machine
 -- model, then the concurrent execution is correct.
 linearisable :: Forest (Command, Response) -> Bool

src/sut/dumblog/app/Main.hs

@@ -8,15 +8,15 @@ import qualified Journal.Types.AtomicCounter as AtomicCounter
 import qualified Journal.Internal.Metrics as Metrics
 import Journal.Internal.Logger as Logger
 
-import Blocker (emptyBlocker)
-import Codec (Envelope(..), decode)
-import FrontEnd (runFrontEnd, FrontEndInfo(..))
-import Metrics (dumblogSchema)
-import Snapshot (Snapshot)
-import qualified Snapshot
-import StateMachine(InMemoryDumblog, initState, runCommand)
-import Types (Command)
-import Worker (worker, WorkerInfo(..))
+import Dumblog.Journal.Blocker (emptyBlocker)
+import Dumblog.Journal.Codec (Envelope(..), decode)
+import Dumblog.Journal.FrontEnd (runFrontEnd, FrontEndInfo(..))
+import Dumblog.Journal.Metrics (dumblogSchema)
+import Dumblog.Journal.Snapshot (Snapshot)
+import qualified Dumblog.Journal.Snapshot as Snapshot
+import Dumblog.Journal.StateMachine(InMemoryDumblog, initState, runCommand)
+import Dumblog.Journal.Types (Command)
+import Dumblog.Journal.Worker (worker, WorkerInfo(..))
 
 fetchJournal :: Maybe Snapshot -> FilePath -> Journal.Options -> IO Journal
 fetchJournal mSnapshot fpj opts = do

src/sut/dumblog/dumblog.cabal

@@ -25,23 +25,6 @@ extra-source-files:
   LICENSE
   README.md
 
-executable dumblog
-    main-is:          Main.hs
-
-    -- Modules included in this executable, other than Main.
-    -- other-modules:
-
-    -- LANGUAGE extensions used by modules in this package.
-    -- other-extensions:
-    build-depends:
-      , async
-      , base ^>=4.14.1.0
-      , directory
-      , dumblog
-      , journal
-    hs-source-dirs:   app
-    default-language: Haskell2010
-
 library
   build-depends:
       , base ^>=4.14.1.0
@@ -57,13 +40,30 @@ library
       , wai
       , warp
   exposed-modules:
-      Blocker
-    , Codec
-    , FrontEnd
-    , Metrics
-    , Snapshot
-    , StateMachine
-    , Types
-    , Worker
+      Dumblog.Journal.Blocker
+    , Dumblog.Journal.Codec
+    , Dumblog.Journal.FrontEnd
+    , Dumblog.Journal.Metrics
+    , Dumblog.Journal.Snapshot
+    , Dumblog.Journal.StateMachine
+    , Dumblog.Journal.Types
+    , Dumblog.Journal.Worker
   hs-source-dirs: src
   default-language: Haskell2010
+
+executable dumblog
+    main-is:          Main.hs
+
+    -- Modules included in this executable, other than Main.
+    -- other-modules:
+
+    -- LANGUAGE extensions used by modules in this package.
+    -- other-extensions:
+    build-depends:
+      , async
+      , base ^>=4.14.1.0
+      , directory
+      , dumblog
+      , journal
+    hs-source-dirs:   app
+    default-language: Haskell2010

src/sut/dumblog/src/Blocker.hs → src/sut/dumblog/src/Dumblog/Journal/Blocker.hs

@@ -1,4 +1,4 @@
-module Blocker
+module Dumblog.Journal.Blocker
   (Blocker, emptyBlocker, blockUntil, wakeUp)
 where
 

src/sut/dumblog/src/Codec.hs → src/sut/dumblog/src/Dumblog/Journal/Codec.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE DeriveGeneric, DeriveFunctor#-}
-module Codec where
+module Dumblog.Journal.Codec where
 
 import Data.Binary (Binary)
 import qualified Data.Binary as Binary

src/sut/dumblog/src/FrontEnd.hs → src/sut/dumblog/src/Dumblog/Journal/FrontEnd.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module FrontEnd where
+module Dumblog.Journal.FrontEnd where
 
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.ByteString.Lazy.Char8 as LBS8
@@ -17,9 +17,9 @@ import qualified Journal
 import Journal.Types.AtomicCounter (AtomicCounter)
 import qualified Journal.Types.AtomicCounter as AtomicCounter
 
-import Blocker
-import Codec
-import Types
+import Dumblog.Journal.Blocker
+import Dumblog.Journal.Codec
+import Dumblog.Journal.Types
 
 data FrontEndInfo = FrontEndInfo
   { sequenceNumber :: AtomicCounter

src/sut/dumblog/src/Metrics.hs → src/sut/dumblog/src/Dumblog/Journal/Metrics.hs

@@ -1,4 +1,4 @@
-module Metrics where
+module Dumblog.Journal.Metrics where
 
 import Journal.Internal.Metrics (MetricsSchema, Metrics) -- should maybe be moved to separate package
 import qualified Journal.Internal.Metrics as Metrics

src/sut/dumblog/src/Snapshot.hs → src/sut/dumblog/src/Dumblog/Journal/Snapshot.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE DeriveGeneric #-}
-module Snapshot where
+module Dumblog.Journal.Snapshot where
 
 import Data.Binary (Binary)
 import qualified Data.Binary as Binary
@@ -10,7 +10,7 @@ import qualified System.Directory as Dir
 import qualified System.FilePath as FP
 import System.IO (hClose, IOMode(ReadMode), openFile, openTempFile)
 
-import StateMachine
+import Dumblog.Journal.StateMachine
 
 data Snapshot = Snapshot
   { ssBytesInJournal :: Int

src/sut/dumblog/src/StateMachine.hs → src/sut/dumblog/src/Dumblog/Journal/StateMachine.hs

@@ -1,14 +1,14 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveGeneric #-}
-module StateMachine where
+module Dumblog.Journal.StateMachine where
 
 import Data.Binary (Binary)
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.ByteString.Lazy.Char8 as LBS8
 import GHC.Generics (Generic)
 
-import Types
+import Dumblog.Journal.Types
 
 -- This is the main state of Dumblog, which is the result of applying all commands in the log
 data InMemoryDumblog = InMemoryDumblog

src/sut/dumblog/src/Types.hs → src/sut/dumblog/src/Dumblog/Journal/Types.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE DeriveGeneric #-}
-module Types where
+module Dumblog.Journal.Types where
 
 import Data.Binary (Binary)
 import Data.ByteString (ByteString)

src/sut/dumblog/src/Worker.hs → src/sut/dumblog/src/Dumblog/Journal/Worker.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module Worker where
+module Dumblog.Journal.Worker where
 
 import Control.Concurrent (threadDelay)
 import Control.Monad (unless)
@@ -14,12 +14,12 @@ import qualified Journal
 import qualified Journal.Internal.Metrics as Metrics
 import qualified Journal.Types.AtomicCounter as AtomicCounter
 
-import Blocker
-import Codec
-import Metrics
-import qualified Snapshot
-import StateMachine
-import Types
+import Dumblog.Journal.Blocker
+import Dumblog.Journal.Codec
+import Dumblog.Journal.Metrics
+import qualified Dumblog.Journal.Snapshot as Snapshot
+import Dumblog.Journal.StateMachine
+import Dumblog.Journal.Types
 
 data WorkerInfo = WorkerInfo
   { wiBlockers :: Blocker (Either Response Response)