From 6351fc23acb7758452b2395e5b8001e827c0c721 Mon Sep 17 00:00:00 2001 From: Laurent Rene de Cotret Date: Sat, 31 Aug 2024 14:47:53 -0400 Subject: [PATCH] Harmonized dependency bounds across all packages --- .../distributed-process-async/tests/TestAsync.hs | 2 +- .../tests/TestUtils.hs | 6 ++---- .../distributed-process-execution.cabal | 16 ++++++++-------- .../tests/TestExchange.hs | 3 +-- .../tests/TestMailbox.hs | 3 +-- .../distributed-process-extras.cabal | 8 ++++---- .../distributed-process-extras/tests/TestLog.hs | 3 +-- .../tests/TestPrimitives.hs | 3 +-- .../tests/TestTimer.hs | 6 ++---- .../tests/TestUtils.hs | 5 ++--- .../distributed-process-systest.cabal | 2 +- 11 files changed, 24 insertions(+), 33 deletions(-) diff --git a/packages/distributed-process-async/tests/TestAsync.hs b/packages/distributed-process-async/tests/TestAsync.hs index 2a18c1a8..a620c8d9 100644 --- a/packages/distributed-process-async/tests/TestAsync.hs +++ b/packages/distributed-process-async/tests/TestAsync.hs @@ -219,7 +219,7 @@ asyncStmTests transport = do -- | Given a @builder@ function, make and run a test suite on a single transport testMain :: (NT.Transport -> IO [Test]) -> IO () testMain builder = do - Right (transport, _) <- createTransportExposeInternals "127.0.0.1" "0" (\sn -> ("127.0.0.1", sn)) defaultTCPParameters + Right (transport, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "0") defaultTCPParameters testData <- builder transport defaultMain testData diff --git a/packages/distributed-process-client-server/tests/TestUtils.hs b/packages/distributed-process-client-server/tests/TestUtils.hs index 5d76f8ad..a6ac5116 100644 --- a/packages/distributed-process-client-server/tests/TestUtils.hs +++ b/packages/distributed-process-client-server/tests/TestUtils.hs @@ -37,14 +37,12 @@ waitForExit exitReason = do mkNode :: String -> IO LocalNode mkNode port = do - Right (transport1, _) <- createTransportExposeInternals - "127.0.0.1" port ("127.0.0.1",) defaultTCPParameters + Right (transport1, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" port) defaultTCPParameters newLocalNode transport1 initRemoteTable -- | Given a @builder@ function, make and run a test suite on a single transport testMain :: (NT.Transport -> IO [Test]) -> IO () testMain builder = do - Right (transport, _) <- createTransportExposeInternals - "127.0.0.1" "0" ("127.0.0.1",) defaultTCPParameters + Right (transport, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "0") defaultTCPParameters testData <- builder transport defaultMain testData diff --git a/packages/distributed-process-execution/distributed-process-execution.cabal b/packages/distributed-process-execution/distributed-process-execution.cabal index 2113f903..1b414c35 100644 --- a/packages/distributed-process-execution/distributed-process-execution.cabal +++ b/packages/distributed-process-execution/distributed-process-execution.cabal @@ -71,15 +71,15 @@ test-suite ExchangeTests containers, hashable, unordered-containers >= 0.2.3.0 && < 0.3, - distributed-process >= 0.5.3 && < 0.7, + distributed-process, distributed-process-execution, - distributed-process-extras >= 0.3.1 && < 0.4, - distributed-process-systest >= 0.1.1 && < 0.2, + distributed-process-extras, + distributed-process-systest >= 0.1.1 && < 0.4, distributed-static, bytestring, data-accessor, fingertree < 0.2, - network-transport >= 0.4 && < 0.5, + network-transport >= 0.4 && < 0.6, deepseq, mtl, network-transport-tcp >= 0.4 && < 0.9, @@ -111,15 +111,15 @@ test-suite MailboxTests containers, hashable, unordered-containers >= 0.2.3.0 && < 0.3, - distributed-process >= 0.6.6 && < 0.7, + distributed-process, distributed-process-execution, - distributed-process-extras >= 0.3.1 && < 0.4, - distributed-process-systest >= 0.1.1 && < 0.2, + distributed-process-extras, + distributed-process-systest >= 0.1.1 && < 0.4, distributed-static, bytestring, data-accessor, fingertree < 0.2, - network-transport >= 0.4 && < 0.5, + network-transport >= 0.4 && < 0.6, deepseq, mtl, network-transport-tcp >= 0.4 && < 0.9, diff --git a/packages/distributed-process-execution/tests/TestExchange.hs b/packages/distributed-process-execution/tests/TestExchange.hs index 80441f24..ed01943a 100644 --- a/packages/distributed-process-execution/tests/TestExchange.hs +++ b/packages/distributed-process-execution/tests/TestExchange.hs @@ -188,7 +188,6 @@ main = testMain $ tests -- | Given a @builder@ function, make and run a test suite on a single transport testMain :: (NT.Transport -> IO [Test]) -> IO () testMain builder = do - Right (transport, _) <- createTransportExposeInternals - "127.0.0.1" "10501" defaultTCPParameters + Right (transport, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "10501") defaultTCPParameters testData <- builder transport defaultMain testData diff --git a/packages/distributed-process-execution/tests/TestMailbox.hs b/packages/distributed-process-execution/tests/TestMailbox.hs index 75154101..ef4c7de4 100644 --- a/packages/distributed-process-execution/tests/TestMailbox.hs +++ b/packages/distributed-process-execution/tests/TestMailbox.hs @@ -259,7 +259,6 @@ main = testMain $ tests -- | Given a @builder@ function, make and run a test suite on a single transport testMain :: (NT.Transport -> IO [Test]) -> IO () testMain builder = do - Right (transport, _) <- createTransportExposeInternals - "127.0.0.1" "10501" defaultTCPParameters + Right (transport, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "10501") defaultTCPParameters testData <- builder transport defaultMain testData diff --git a/packages/distributed-process-extras/distributed-process-extras.cabal b/packages/distributed-process-extras/distributed-process-extras.cabal index 194e011e..e4806f7d 100644 --- a/packages/distributed-process-extras/distributed-process-extras.cabal +++ b/packages/distributed-process-extras/distributed-process-extras.cabal @@ -73,7 +73,7 @@ test-suite InternalQueueTests ansi-terminal >= 0.5 && < 0.9, distributed-process >= 0.6.0 && < 0.8, distributed-process-extras, - distributed-process-systest >= 0.1.0 && < 0.3.0, + distributed-process-systest >= 0.1.0 && < 0.4, HUnit >= 1.2 && < 2, test-framework >= 0.6 && < 0.9, test-framework-hunit, @@ -96,7 +96,7 @@ test-suite PrimitivesTests ansi-terminal >= 0.5 && < 0.9, distributed-process >= 0.6.0 && < 0.8, distributed-process-extras, - distributed-process-systest >= 0.1.0 && < 0.3.0, + distributed-process-systest >= 0.1.0 && < 0.4, network-transport >= 0.4 && < 0.6, mtl, containers, @@ -125,7 +125,7 @@ test-suite TimerTests deepseq, distributed-process >= 0.6.0 && < 0.8, distributed-process-extras, - distributed-process-systest >= 0.1.0 && < 0.3.0, + distributed-process-systest >= 0.1.0 && < 0.4, network-transport >= 0.4 && < 0.6, network-transport-tcp >= 0.4 && < 0.9, HUnit >= 1.2 && < 2, @@ -153,7 +153,7 @@ test-suite LoggerTests unordered-containers >= 0.2.3.0 && < 0.3, distributed-process >= 0.6.0 && < 0.8, distributed-process-extras, - distributed-process-systest >= 0.1.0 && < 0.3.0, + distributed-process-systest >= 0.1.0 && < 0.4, distributed-static, bytestring, data-accessor, diff --git a/packages/distributed-process-extras/tests/TestLog.hs b/packages/distributed-process-extras/tests/TestLog.hs index c43c06f9..a04b5063 100644 --- a/packages/distributed-process-extras/tests/TestLog.hs +++ b/packages/distributed-process-extras/tests/TestLog.hs @@ -133,8 +133,7 @@ tests transport = do -- | Given a @builder@ function, make and run a test suite on a single transport testMain :: (NT.Transport -> IO [Test]) -> IO () testMain builder = do - Right (transport, _) <- createTransportExposeInternals - "127.0.0.1" "0" defaultTCPParameters + Right (transport, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "0") defaultTCPParameters testData <- builder transport defaultMain testData diff --git a/packages/distributed-process-extras/tests/TestPrimitives.hs b/packages/distributed-process-extras/tests/TestPrimitives.hs index d598532d..e4092b77 100644 --- a/packages/distributed-process-extras/tests/TestPrimitives.hs +++ b/packages/distributed-process-extras/tests/TestPrimitives.hs @@ -213,8 +213,7 @@ primitivesTests transport = do -- | Given a @builder@ function, make and run a test suite on a single transport testMain :: (NT.Transport -> IO [Test]) -> IO () testMain builder = do - Right (transport, _) <- createTransportExposeInternals - "127.0.0.1" "0" defaultTCPParameters + Right (transport, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "0") defaultTCPParameters testData <- builder transport defaultMain testData diff --git a/packages/distributed-process-extras/tests/TestTimer.hs b/packages/distributed-process-extras/tests/TestTimer.hs index 3da4c949..2dc013b7 100644 --- a/packages/distributed-process-extras/tests/TestTimer.hs +++ b/packages/distributed-process-extras/tests/TestTimer.hs @@ -1,3 +1,4 @@ +{-# OPTIONS_GHC -Wno-orphans #-} module Main where #if ! MIN_VERSION_base(4,6,0) @@ -25,8 +26,6 @@ import Test.Framework.Providers.HUnit (testCase) import Network.Transport.TCP import qualified Network.Transport as NT -import GHC.Generics - instance NFData Ping where testSendAfter :: TestResult Bool -> Process () @@ -186,8 +185,7 @@ timerTests transport = do -- | Given a @builder@ function, make and run a test suite on a single transport testMain :: (NT.Transport -> IO [Test]) -> IO () testMain builder = do - Right (transport, _) <- createTransportExposeInternals - "127.0.0.1" "0" defaultTCPParameters + Right (transport, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "0") defaultTCPParameters testData <- builder transport defaultMain testData diff --git a/packages/distributed-process-supervisor/tests/TestUtils.hs b/packages/distributed-process-supervisor/tests/TestUtils.hs index ef4303f7..91e09e66 100644 --- a/packages/distributed-process-supervisor/tests/TestUtils.hs +++ b/packages/distributed-process-supervisor/tests/TestUtils.hs @@ -124,7 +124,7 @@ waitForExit exitReason = do mkNode :: String -> IO LocalNode mkNode port = do Right (transport1, _) <- - createTransportExposeInternals "127.0.0.1" port ("127.0.0.1",) defaultTCPParameters + createTransportExposeInternals (defaultTCPAddr "127.0.0.1" port) defaultTCPParameters newLocalNode transport1 initRemoteTable -- | Run the supplied @testProc@ using an @MVar@ to collect and assert @@ -169,8 +169,7 @@ stopLogger = (flip Exception.throwTo) Exception.ThreadKilled . _tid -- | Given a @builder@ function, make and run a test suite on a single transport testMain :: (NT.Transport -> IO [Test]) -> IO () testMain builder = do - Right (transport, _) <- createTransportExposeInternals - "127.0.0.1" "0" ("127.0.0.1",) defaultTCPParameters + Right (transport, _) <- createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "0") defaultTCPParameters testData <- builder transport defaultMain testData diff --git a/packages/distributed-process-systest/distributed-process-systest.cabal b/packages/distributed-process-systest/distributed-process-systest.cabal index 84d02bf5..2bd68725 100644 --- a/packages/distributed-process-systest/distributed-process-systest.cabal +++ b/packages/distributed-process-systest/distributed-process-systest.cabal @@ -26,7 +26,7 @@ library distributed-static < 0.4, HUnit >= 1.2 && < 2, network-transport >= 0.4.1.0 && < 0.6, - network >= 2.5 && < 3.2, + network >= 2.5 && < 3.3, random >= 1.0 && < 1.3, rematch >= 0.1.2.1 && < 0.3, test-framework >= 0.6 && < 0.9,