From 785fd89b1f3fcfafb546685efeac9081fe580015 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Sun, 11 Jul 2021 22:29:24 +0200
Subject: [PATCH] Move modules to Quasar.Network namespace
---
qrpc.cabal => quasar-network.cabal | 12 ++++++------
src/{Network/Rpc.hs => Quasar/Network.hs} | 6 +++---
src/{Network/Rpc => Quasar/Network}/Connection.hs | 2 +-
src/{Network/Rpc => Quasar/Network}/Multiplexer.hs | 4 ++--
.../Rpc => Quasar/Network}/SocketLocation.hs | 2 +-
.../Rpc => Quasar/Network}/MultiplexerSpec.hs | 6 +++---
test/{Network/RpcSpec.hs => Quasar/NetworkSpec.hs} | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
rename qrpc.cabal => quasar-network.cabal (92%)
rename src/{Network/Rpc.hs => Quasar/Network.hs} (99%)
rename src/{Network/Rpc => Quasar/Network}/Connection.hs (99%)
rename src/{Network/Rpc => Quasar/Network}/Multiplexer.hs (99%)
rename src/{Network/Rpc => Quasar/Network}/SocketLocation.hs (96%)
rename test/{Network/Rpc => Quasar/Network}/MultiplexerSpec.hs (97%)
rename test/{Network/RpcSpec.hs => Quasar/NetworkSpec.hs} (98%)
diff --git a/qrpc.cabal b/quasar-network.cabal
similarity index 92%
rename from qrpc.cabal
rename to quasar-network.cabal
index 32ccff7..86cad12 100644
--- a/qrpc.cabal
+++ b/quasar-network.cabal
@@ -79,10 +79,10 @@ common shared-executable-properties
library
import: shared-properties
exposed-modules:
- Network.Rpc
- Network.Rpc.Connection
- Network.Rpc.Multiplexer
- Network.Rpc.SocketLocation
+ Quasar.Network
+ Quasar.Network.Connection
+ Quasar.Network.Multiplexer
+ Quasar.Network.SocketLocation
hs-source-dirs:
src
@@ -95,7 +95,7 @@ test-suite quasar-network-test
QuickCheck
main-is: Spec.hs
other-modules:
- Network.RpcSpec
- Network.Rpc.MultiplexerSpec
+ Quasar.NetworkSpec
+ Quasar.Network.MultiplexerSpec
hs-source-dirs:
test
diff --git a/src/Network/Rpc.hs b/src/Quasar/Network.hs
similarity index 99%
rename from src/Network/Rpc.hs
rename to src/Quasar/Network.hs
index 2348be5..64ca1aa 100644
--- a/src/Network/Rpc.hs
+++ b/src/Quasar/Network.hs
@@ -1,4 +1,4 @@
-module Network.Rpc where
+module Quasar.Network where
import Control.Applicative (liftA2)
import Control.Concurrent (forkFinally)
@@ -16,8 +16,8 @@ import Data.Maybe (isNothing)
import GHC.Generics
import Language.Haskell.TH hiding (interruptible)
import Language.Haskell.TH.Syntax
-import Network.Rpc.Multiplexer
-import Network.Rpc.Connection
+import Quasar.Network.Multiplexer
+import Quasar.Network.Connection
import qualified Network.Socket as Socket
import Prelude
import System.Posix.Files (getFileStatus, isSocket, fileExist, removeLink)
diff --git a/src/Network/Rpc/Connection.hs b/src/Quasar/Network/Connection.hs
similarity index 99%
rename from src/Network/Rpc/Connection.hs
rename to src/Quasar/Network/Connection.hs
index 8c728fb..666a84e 100644
--- a/src/Network/Rpc/Connection.hs
+++ b/src/Quasar/Network/Connection.hs
@@ -1,4 +1,4 @@
-module Network.Rpc.Connection where
+module Quasar.Network.Connection where
import Control.Concurrent (threadDelay)
import Control.Concurrent.Async (Async, async, cancel, link, waitCatch, withAsync)
diff --git a/src/Network/Rpc/Multiplexer.hs b/src/Quasar/Network/Multiplexer.hs
similarity index 99%
rename from src/Network/Rpc/Multiplexer.hs
rename to src/Quasar/Network/Multiplexer.hs
index b83261e..13ed48e 100644
--- a/src/Network/Rpc/Multiplexer.hs
+++ b/src/Quasar/Network/Multiplexer.hs
@@ -1,4 +1,4 @@
-module Network.Rpc.Multiplexer (
+module Quasar.Network.Multiplexer (
ChannelId,
MessageId,
MessageLength,
@@ -38,7 +38,7 @@ import qualified Data.ByteString.Lazy as BSL
import qualified Data.HashMap.Strict as HM
import Data.Tuple (swap)
import Data.Word
-import Network.Rpc.Connection
+import Quasar.Network.Connection
import Prelude
import GHC.Generics
import System.IO (hPutStrLn, stderr)
diff --git a/src/Network/Rpc/SocketLocation.hs b/src/Quasar/Network/SocketLocation.hs
similarity index 96%
rename from src/Network/Rpc/SocketLocation.hs
rename to src/Quasar/Network/SocketLocation.hs
index 5585874..f8ed7f1 100644
--- a/src/Network/Rpc/SocketLocation.hs
+++ b/src/Quasar/Network/SocketLocation.hs
@@ -1,4 +1,4 @@
-module Network.Rpc.SocketLocation where
+module Quasar.Network.SocketLocation where
import Control.Exception (handle)
import Prelude
diff --git a/test/Network/Rpc/MultiplexerSpec.hs b/test/Quasar/Network/MultiplexerSpec.hs
similarity index 97%
rename from test/Network/Rpc/MultiplexerSpec.hs
rename to test/Quasar/Network/MultiplexerSpec.hs
index 71664ed..88998eb 100644
--- a/test/Network/Rpc/MultiplexerSpec.hs
+++ b/test/Quasar/Network/MultiplexerSpec.hs
@@ -1,4 +1,4 @@
-module Network.Rpc.MultiplexerSpec where
+module Quasar.Network.MultiplexerSpec where
import Control.Concurrent (threadDelay)
import Control.Concurrent.Async (concurrently_)
@@ -7,8 +7,8 @@ import Control.Exception (bracket, mask_)
import Control.Monad (forever, void, unless)
import qualified Data.ByteString.Lazy as BSL
import Prelude
-import Network.Rpc.Multiplexer
-import Network.Rpc.Connection
+import Quasar.Network.Multiplexer
+import Quasar.Network.Connection
import Network.Socket
import Test.Hspec
diff --git a/test/Network/RpcSpec.hs b/test/Quasar/NetworkSpec.hs
similarity index 98%
rename from test/Network/RpcSpec.hs
rename to test/Quasar/NetworkSpec.hs
index c2b8065..77e158b 100644
--- a/test/Network/RpcSpec.hs
+++ b/test/Quasar/NetworkSpec.hs
@@ -8,12 +8,12 @@
-- Print generated rpc code during build
{-# OPTIONS_GHC -ddump-splices #-}
-module Network.RpcSpec where
+module Quasar.NetworkSpec where
import Control.Concurrent.MVar
import Control.Monad.IO.Class (liftIO)
import Prelude
-import Network.Rpc
+import Quasar.Network
import Test.Hspec
import Test.QuickCheck
import Test.QuickCheck.Monadic
--
GitLab