Skip to content

Commit

Permalink
Harmonized dependency bounds across all packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@LaurentRDC
LaurentRDC committed Aug 31, 2024
1 parent 4c95bdc commit 6351fc2
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 33 deletions.
2 changes: 1 addition & 1 deletion packages/distributed-process-async/tests/TestAsync.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 2 additions & 4 deletions packages/distributed-process-client-server/tests/TestUtils.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 8 additions & 8 deletions packages/distributed-process-execution/distributed-process-execution.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions packages/distributed-process-execution/tests/TestExchange.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions packages/distributed-process-execution/tests/TestMailbox.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions packages/distributed-process-extras/distributed-process-extras.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions packages/distributed-process-extras/tests/TestLog.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions packages/distributed-process-extras/tests/TestPrimitives.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 2 additions & 4 deletions packages/distributed-process-extras/tests/TestTimer.hs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# OPTIONS_GHC -Wno-orphans #-}
module Main where

#if ! MIN_VERSION_base(4,6,0)
Expand Down Expand Up @@ -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 ()
Expand Down Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions packages/distributed-process-supervisor/tests/TestUtils.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/distributed-process-systest/distributed-process-systest.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6351fc2

Please sign in to comment.