Add upper bound for network and upgrade lts version (#22)

Add upper bound for network and upgrade lts version
creichert · Jun 27, 2019 · e3db9cc · e3db9cc
2 parents eece473 + 47eb677
commit e3db9cc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/script/benchmark.hs b/script/benchmark.hs
@@ -18,7 +18,8 @@ import Data.Monoid ((<>))
 import Data.Text (Text, strip, stripPrefix, toCaseFold)
 import Data.Text.Encoding (decodeUtf8)
 import Network.HTTP.Types (hAuthorization, status200, status400)
-import Network.Wai (Request, Response, requestBody, requestHeaders, responseLBS)
+import Network.Wai (Request, Response, requestHeaders, responseLBS)
+import Network.Wai.Internal (getRequestBodyChunk)
 import Network.Wai.Handler.Warp (run)
 import qualified Network.Wai.Middleware.Throttle as Throttle
 import Network.Wreq ( defaults, getWith, header, postWith
@@ -43,7 +44,7 @@ extractKey =
 serverWithThrottle :: (Eq a, Hashable a) => Throttle.Throttle a -> Int -> IO ThreadId
 serverWithThrottle th port =
   let app = Throttle.throttle th $ \ x f ->
-        f . responseLBS status200 [] . fromStrict =<< requestBody x
+        f . responseLBS status200 [] . fromStrict =<< getRequestBodyChunk x
   in forkIO $ run port app
 
 benchmark :: String -> Int -> Benchmark

diff --git a/script/throttle-simple-server.hs b/script/throttle-simple-server.hs
@@ -19,7 +19,8 @@ import Data.Monoid ((<>))
 import Data.Text (Text, strip, stripPrefix, toCaseFold)
 import Data.Text.Encoding (decodeUtf8)
 import Network.HTTP.Types (hAuthorization, status200, status400)
-import Network.Wai (Request, Response, requestBody, requestHeaders, responseLBS)
+import Network.Wai (Request, Response, requestHeaders, responseLBS)
+import Network.Wai.Internal (getRequestBodyChunk)
 import Network.Wai.Handler.Warp (run)
 import qualified Network.Wai.Middleware.Throttle as Throttle
 import Network.Wreq ( defaults, getWith, header, postWith
@@ -47,7 +48,7 @@ extractKey =
 serverWithThrottle :: (Eq a, Hashable a) => Throttle.Throttle a -> Int -> IO ThreadId
 serverWithThrottle th port =
   let app = Throttle.throttle th $ \ x f ->
-        f . responseLBS status200 [] . fromStrict =<< requestBody x
+        f . responseLBS status200 [] . fromStrict =<< getRequestBodyChunk x
   in forkIO $ run port app
 
 makeRequest :: [String] -> Int -> Method -> IO ()

diff --git a/stack.yaml b/stack.yaml
@@ -1,8 +1,5 @@
 
-resolver: lts-12.10
-
-extra-deps:
-  - token-bucket-0.1.0.1
+resolver: lts-13.12
 
 packages:
   - '.'

diff --git a/wai-middleware-throttle.cabal b/wai-middleware-throttle.cabal
@@ -1,5 +1,5 @@
 name:                wai-middleware-throttle
-version:             0.3.0.0
+version:             0.3.0.1
 license:             BSD3
 license-file:        LICENSE
 author:              Christopher Reichert
@@ -34,7 +34,7 @@ library
                      , hashable              >= 1.2
                      , http-types
                      , mtl
-                     , network               >= 2.1
+                     , network               >= 2.4.2 && <3.2
                      , safe-exceptions
                      , stm
                      , text