no maybe

kazu-yamamoto · Sep 4, 2023 · f243e31 · f243e31
1 parent 6328750
commit f243e31
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Network/HTTP2/Arch/Config.hs b/Network/HTTP2/Arch/Config.hs
@@ -26,9 +26,9 @@ data Config = Config {
     , confPositionReadMaker :: PositionReadMaker
     , confTimeoutManager :: T.Manager
     -- | This is copied into 'Aux', if exist, on server.
-    , confMySockAddr     :: Maybe SockAddr
+    , confMySockAddr     :: SockAddr
     -- | This is copied into 'Aux', if exist, on server.
-    , confPeerSockAddr   :: Maybe SockAddr
+    , confPeerSockAddr   :: SockAddr
     }
 
 -- | Making simple configuration whose IO is not efficient.
@@ -47,8 +47,8 @@ allocSimpleConfig s bufsiz = do
           , confReadN = defaultReadN s ref
           , confPositionReadMaker = defaultPositionReadMaker
           , confTimeoutManager = timmgr
-          , confMySockAddr   = Just mysa
-          , confPeerSockAddr = Just peersa
+          , confMySockAddr   = mysa
+          , confPeerSockAddr = peersa
           }
     return config
 

diff --git a/Network/HTTP2/Arch/Context.hs b/Network/HTTP2/Arch/Context.hs
@@ -88,13 +88,13 @@ data Context = Context {
   , pingRate           :: Rate
   , settingsRate       :: Rate
   , emptyFrameRate     :: Rate
-  , mySockAddr         :: Maybe SockAddr
-  , peerSockAddr       :: Maybe SockAddr
+  , mySockAddr         :: SockAddr
+  , peerSockAddr       :: SockAddr
   }
 
 ----------------------------------------------------------------
 
-newContext :: RoleInfo -> BufferSize -> Maybe SockAddr -> Maybe SockAddr -> IO Context
+newContext :: RoleInfo -> BufferSize -> SockAddr -> SockAddr -> IO Context
 newContext rinfo siz mysa peersa =
     Context rl rinfo
                <$> newIORef False

diff --git a/Network/HTTP2/Server/Types.hs b/Network/HTTP2/Server/Types.hs
@@ -37,7 +37,7 @@ data Aux = Aux {
     -- | Time handle for the worker processing this request and response.
     auxTimeHandle  :: T.Handle
     -- | Local socket address copied from 'Config'.
-  , auxMySockAddr  :: Maybe SockAddr
+  , auxMySockAddr   :: SockAddr
     -- | Remove socket address copied from 'Config'.
-  , auxPeerSockAddr :: Maybe SockAddr
+  , auxPeerSockAddr :: SockAddr
   }
diff --git a/Network/HTTP2/Server/Worker.hs b/Network/HTTP2/Server/Worker.hs
@@ -33,8 +33,8 @@ data WorkerConf a = WorkerConf {
   , isPushable     :: IO Bool
   , insertStream   :: StreamId -> a -> IO ()
   , makePushStream :: a -> PushPromise -> IO (StreamId, StreamId, a)
-  , mySockAddr     :: Maybe SockAddr
-  , peerSockAddr   :: Maybe SockAddr
+  , mySockAddr     :: SockAddr
+  , peerSockAddr   :: SockAddr
   }
 
 fromContext :: Context -> WorkerConf Stream