refactor(simulation): restrict Chan API

Author: wenkokke

simulation/src/Chan/Driver.hs

@@ -7,13 +7,16 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# OPTIONS_GHC -Wno-name-shadowing #-}
 
-module Chan.Driver where
+module Chan.Driver (
+  ProtocolMessage (..),
+  protocolMessage,
+  chanDriver,
+) where
 
-import Chan.Core
-import Chan.TCP
-import Data.Type.Equality
+import Chan.Core (Chan (readChan, writeChan))
+import Chan.TCP (MessageSize (..))
+import Data.Type.Equality (type (:~:) (..))
 import Network.TypedProtocol (
   ActiveState,
   Driver (..),
@@ -49,27 +52,27 @@ chanDriver ::
   Driver ps pr () m
 chanDriver cmp ch =
   Driver
-    { sendMessage = sendMessage
-    , recvMessage = recvMessage
+    { sendMessage = sendMessage'
+    , recvMessage = recvMessage'
     , initialDState = ()
     }
  where
-  sendMessage ::
+  sendMessage' ::
     forall (st :: ps) (st' :: ps).
     (StateTokenI st, StateTokenI st', ActiveState st) =>
     WeHaveAgencyProof pr st ->
     Message ps st st' ->
     m ()
-  sendMessage _prf msg =
+  sendMessage' _prf msg =
     writeChan ch (ProtocolMessage (SomeMessage msg))
 
-  recvMessage ::
+  recvMessage' ::
     forall (st :: ps).
     (StateTokenI st, ActiveState st) =>
     TheyHaveAgencyProof pr st ->
     () ->
     m (SomeMessage st, ())
-  recvMessage _prf () = do
+  recvMessage' _prf () = do
     ProtocolMessage smsg <- readChan ch
     case smsg of
       SomeMessage (msg :: Message ps st' st1) -> case cmp @st @st' of

simulation/src/Chan/Mux.hs

@@ -10,13 +10,8 @@
 {-# LANGUAGE TypeFamilies #-}
 
 module Chan.Mux (
-  newMuxChan,
-  Chan (..),
   ToFromMuxMsg (..),
-  dynToFromMuxMsg,
   MuxBundle (..),
-  BearerMsg,
-  fromBearerMsg,
   newConnectionBundleTCP,
 ) where
 

simulation/src/LeiosProtocol/Relay.hs

@@ -25,7 +25,6 @@
 module LeiosProtocol.Relay where
 
 import Chan
-import Chan.Driver (ProtocolMessage, chanDriver)
 import Control.DeepSeq (NFData)
 import Control.Exception (Exception, assert, throw)
 import Control.Monad (forM_, join, unless, void, when)

simulation/src/LeiosProtocol/Short/Node.hs

@@ -13,7 +13,7 @@
 
 module LeiosProtocol.Short.Node where
 
-import Chan.Mux
+import Chan
 import Control.Category ((>>>))
 import Control.Concurrent.Class.MonadMVar
 import Control.Concurrent.Class.MonadSTM.TSem

simulation/src/LeiosProtocol/Short/Sim.hs

@@ -12,9 +12,7 @@
 
 module LeiosProtocol.Short.Sim where
 
-import Chan.Driver
-import Chan.Mux
-import Chan.TCP
+import Chan
 import Control.Exception (assert)
 import Control.Monad (forever)
 import Control.Monad.Class.MonadFork (MonadFork (forkIO))

simulation/src/LeiosProtocol/SimTestRelay.hs

@@ -11,8 +11,6 @@
 module LeiosProtocol.SimTestRelay where
 
 import Chan
-import Chan.Mux
-import Chan.TCP
 import Control.Category ((>>>))
 import Control.Exception (assert)
 import Control.Monad (forever, when)

simulation/src/PraosProtocol/PraosNode.hs

@@ -10,8 +10,7 @@ module PraosProtocol.PraosNode (
 )
 where
 
-import Chan.Driver (protocolMessage)
-import Chan.Mux
+import Chan
 import Control.Exception (assert)
 import Control.Monad.Class.MonadAsync (Concurrently (..), MonadAsync (..))
 import Control.Monad.Class.MonadFork