summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Smrž <roman.smrz@seznam.cz>2024-11-10 17:08:13 +0100
committerRoman Smrž <roman.smrz@seznam.cz>2024-11-10 17:08:13 +0100
commit00dcbf3c14dceaa3b1a54a3d479518302f9c2ce4 (patch)
treed7e11cba5f8d65fc364b845809ba74caa319c31b
parentd144e1d0b45421d102751cdf584126810ab33ba5 (diff)
Move Erebos.Channel module under Erebos.NetworkHEADmasterdevel
-rw-r--r--erebos.cabal2
-rw-r--r--src/Erebos/Network.hs2
-rw-r--r--src/Erebos/Network/Channel.hs (renamed from src/Erebos/Channel.hs)2
-rw-r--r--src/Erebos/Network/Protocol.hs2
4 files changed, 4 insertions, 4 deletions
diff --git a/erebos.cabal b/erebos.cabal
index f16c879..3f6bb67 100644
--- a/erebos.cabal
+++ b/erebos.cabal
@@ -94,13 +94,13 @@ library
hs-source-dirs: src
exposed-modules:
Erebos.Attach
- Erebos.Channel
Erebos.Chatroom
Erebos.Contact
Erebos.Conversation
Erebos.Identity
Erebos.Message
Erebos.Network
+ Erebos.Network.Channel
Erebos.Network.Protocol
Erebos.Object
Erebos.Pairing
diff --git a/src/Erebos/Network.hs b/src/Erebos/Network.hs
index 358bb7c..9572c40 100644
--- a/src/Erebos/Network.hs
+++ b/src/Erebos/Network.hs
@@ -57,11 +57,11 @@ import qualified Network.Socket.ByteString as S
import Foreign.C.Types
import Foreign.Marshal.Alloc
-import Erebos.Channel
#ifdef ENABLE_ICE_SUPPORT
import Erebos.ICE
#endif
import Erebos.Identity
+import Erebos.Network.Channel
import Erebos.Network.Protocol
import Erebos.Object.Internal
import Erebos.PubKey
diff --git a/src/Erebos/Channel.hs b/src/Erebos/Network/Channel.hs
index c17c9ab..a6bab79 100644
--- a/src/Erebos/Channel.hs
+++ b/src/Erebos/Network/Channel.hs
@@ -1,4 +1,4 @@
-module Erebos.Channel (
+module Erebos.Network.Channel (
Channel,
ChannelRequest, ChannelRequestData(..),
ChannelAccept, ChannelAcceptData(..),
diff --git a/src/Erebos/Network/Protocol.hs b/src/Erebos/Network/Protocol.hs
index bceb355..832be0b 100644
--- a/src/Erebos/Network/Protocol.hs
+++ b/src/Erebos/Network/Protocol.hs
@@ -64,9 +64,9 @@ import Data.Void
import System.Clock
-import Erebos.Channel
import Erebos.Flow
import Erebos.Identity
+import Erebos.Network.Channel
import Erebos.Object.Internal
import Erebos.Service