use NgxExportService type synonym in tests for subrequests

lyokha · Feb 17, 2024 · 18a64de · 18a64de
1 parent 6654c0d
commit 18a64de
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/NgxExport/Tools/Resolve.hs b/NgxExport/Tools/Resolve.hs
@@ -4,7 +4,7 @@
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  NgxExport.Tools.Resolve
--- Copyright   :  (c) Alexey Radkov 2022-2023
+-- Copyright   :  (c) Alexey Radkov 2022-2024
 -- License     :  BSD-style
 --
 -- Maintainer  :  alexey.radkov@gmail.com

diff --git a/NgxExport/Tools/Subrequest.hs b/NgxExport/Tools/Subrequest.hs
@@ -106,7 +106,7 @@ import           System.IO.Unsafe
 -- import           Data.ByteString (ByteString)
 -- import qualified Data.ByteString.Lazy as L
 --
--- makeRequest :: ByteString -> Bool -> IO L.ByteString
+-- makeRequest :: ByteString -> 'NgxExportService'
 -- __/makeRequest/__ = const . 'makeSubrequest'
 --
 -- 'ngxExportSimpleService' \'makeRequest $ 'PersistentService' $ Just $ 'Sec' 10
@@ -545,7 +545,7 @@ ngxExportSimpleServiceTyped 'configureUDS ''UDSConf SingleShotService
 -- import qualified Network.Socket.ByteString as SB
 -- import qualified Data.ByteString.Char8 as C8
 --
--- configureUdsManager :: ByteString -> Bool -> IO L.ByteString
+-- configureUdsManager :: ByteString -> 'NgxExportService'
 -- __/configureUdsManager/__ = 'ignitionService' $ \\path -> 'voidHandler' $ do
 --     man <- newManager defaultManagerSettings
 --                { managerRawConnection = return $ openUDS path }

diff --git a/README.md b/README.md
@@ -1853,7 +1853,7 @@ import           NgxExport.Tools.Subrequest
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Lazy as L
 
-makeRequest :: ByteString -> Bool -> IO L.ByteString
+makeRequest :: ByteString -> NgxExportService
 makeRequest = const . makeSubrequest
 
 ngxExportSimpleService 'makeRequest $ PersistentService $ Just $ Sec 10
@@ -2073,7 +2073,7 @@ import qualified Network.Socket as S
 import qualified Network.Socket.ByteString as SB
 import qualified Data.ByteString.Char8 as C8
 
-configureUdsManager :: ByteString -> Bool -> IO L.ByteString
+configureUdsManager :: ByteString -> NgxExportService
 configureUdsManager = ignitionService $ \path -> voidHandler $ do
     man <- newManager defaultManagerSettings
                { managerRawConnection = return $ openUDS path }

diff --git a/test/Subrequest/test-tools-extra-subrequest.cabal b/test/Subrequest/test-tools-extra-subrequest.cabal
@@ -11,7 +11,7 @@ library
   default-language:         Haskell2010
   build-depends:            base >= 4.8 && < 5
                           , ngx-export
-                          , ngx-export-tools
+                          , ngx-export-tools >= 1.2.2
                           , ngx-export-tools-extra
                           , bytestring
                           , http-client

diff --git a/test/Subrequest/test_tools_extra_subrequest.hs b/test/Subrequest/test_tools_extra_subrequest.hs
@@ -14,17 +14,12 @@ import qualified Network.Socket as S
 import qualified Network.Socket.ByteString as SB
 import qualified Data.ByteString.Char8 as C8
 
-makeRequest :: ByteString -> Bool -> IO L.ByteString
+makeRequest :: ByteString -> NgxExportService
 makeRequest = const . makeSubrequest
 
 ngxExportSimpleService 'makeRequest $ PersistentService $ Just $ Sec 10
 
-reqBody :: L.ByteString -> ByteString -> IO L.ByteString
-reqBody = const . return
-
-ngxExportAsyncOnReqBody 'reqBody
-
-configureUdsManager :: ByteString -> Bool -> IO L.ByteString
+configureUdsManager :: ByteString -> NgxExportService
 configureUdsManager = ignitionService $ \path -> voidHandler $ do
     man <- newManager defaultManagerSettings
                { managerRawConnection = return $ openUDS path }
@@ -36,3 +31,8 @@ configureUdsManager = ignitionService $ \path -> voidHandler $ do
 
 ngxExportSimpleService 'configureUdsManager SingleShotService
 
+reqBody :: L.ByteString -> ByteString -> IO L.ByteString
+reqBody = const . return
+
+ngxExportAsyncOnReqBody 'reqBody
+