From 4d5533ad90fee7adfedc7ee05c421c8201dec9c9 Mon Sep 17 00:00:00 2001 From: Lars Kuhtz Date: Sun, 30 Jun 2024 13:08:31 +0200 Subject: [PATCH] fix upper bound of crypton-connection --- chainweb.cabal | 2 +- src/Chainweb/Utils.hs | 5 +++-- test/Chainweb/Test/Utils.hs | 3 ++- tools/cwtool/TxSimulator.hs | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/chainweb.cabal b/chainweb.cabal index 37c54e61f5..913989af3a 100644 --- a/chainweb.cabal +++ b/chainweb.cabal @@ -373,7 +373,7 @@ library , chronos >= 1.1 , clock >= 0.7 , configuration-tools >= 0.6 - , crypton-connection >= 0.2 && < 0.4 + , crypton-connection >= 0.2 , containers >= 0.5 , crypton >= 0.31 , cuckoo >= 0.3 diff --git a/src/Chainweb/Utils.hs b/src/Chainweb/Utils.hs index 1f58ea1e85..a274191420 100644 --- a/src/Chainweb/Utils.hs +++ b/src/Chainweb/Utils.hs @@ -249,6 +249,7 @@ import qualified Data.ByteString.Builder as BB import qualified Data.ByteString.Lazy as BL import qualified Data.Csv as CSV import Data.Decimal +import Data.Default (def) import Data.Functor.Of import Data.Hashable import qualified Data.HashMap.Strict as HM @@ -1348,12 +1349,12 @@ manager micros = HTTP.newManager unsafeManager :: Int -> IO HTTP.Manager unsafeManager micros = HTTP.newTlsManagerWith $ setManagerRequestTimeout micros - $ HTTP.mkManagerSettings (HTTP.TLSSettingsSimple True True True) Nothing + $ HTTP.mkManagerSettings (HTTP.TLSSettingsSimple True True True def) Nothing unsafeManagerWithSettings :: (HTTP.ManagerSettings -> HTTP.ManagerSettings) -> IO HTTP.Manager unsafeManagerWithSettings settings = HTTP.newTlsManagerWith $ settings - $ HTTP.mkManagerSettings (HTTP.TLSSettingsSimple True True True) Nothing + $ HTTP.mkManagerSettings (HTTP.TLSSettingsSimple True True True def) Nothing setManagerRequestTimeout :: Int -> HTTP.ManagerSettings -> HTTP.ManagerSettings setManagerRequestTimeout micros settings = settings diff --git a/test/Chainweb/Test/Utils.hs b/test/Chainweb/Test/Utils.hs index 328de94b22..c607b44735 100644 --- a/test/Chainweb/Test/Utils.hs +++ b/test/Chainweb/Test/Utils.hs @@ -137,6 +137,7 @@ import Data.Bifunctor hiding (second) import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as BL import Data.Coerce (coerce) +import Data.Default (def) import Data.Foldable import qualified Data.HashMap.Strict as HashMap import Data.IORef @@ -1132,7 +1133,7 @@ getClientEnv :: BaseUrl -> IO ClientEnv getClientEnv url = flip mkClientEnv url <$> HTTP.newTlsManagerWith mgrSettings where mgrSettings = HTTP.mkManagerSettings - (HTTP.TLSSettingsSimple True False False) + (HTTP.TLSSettingsSimple True False False def) Nothing -- | Backoff up to a constant 250ms, limiting to ~40s diff --git a/tools/cwtool/TxSimulator.hs b/tools/cwtool/TxSimulator.hs index dbf95dfc6d..8ebe35c683 100644 --- a/tools/cwtool/TxSimulator.hs +++ b/tools/cwtool/TxSimulator.hs @@ -265,7 +265,7 @@ setupClient :: SimConfig -> IO ClientEnv setupClient sc = flip mkClientEnv (scApiHostUrl sc) <$> newTlsManagerWith mgrSettings where mgrSettings = mkManagerSettings - (TLSSettingsSimple True False False) + (TLSSettingsSimple True False False def) Nothing -- | note, fetches [low - 1, hi] to have parent headers