MonadTimer: export DiffTime

Also remove `time` dependency from `ouroboros-network`.
IntersectMBO · Nov 24, 2020 · 8fa98d3 · 8fa98d3
1 parent 57ab004
commit 8fa98d3
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 12 deletions.
diff --git a/io-sim-classes/src/Control/Monad/Class/MonadTimer.hs b/io-sim-classes/src/Control/Monad/Class/MonadTimer.hs
@@ -10,6 +10,7 @@ module Control.Monad.Class.MonadTimer (
   , MonadTimer(..)
   , TimeoutState(..)
 
+  , DiffTime
   , diffTimeToMicrosecondsAsInt
   , microsecondsAsIntToDiffTime
   ) where

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Channel.hs b/ouroboros-network-framework/src/Ouroboros/Network/Channel.hs
@@ -26,7 +26,6 @@ import           Control.Monad.Class.MonadTimer
 import qualified Data.ByteString      as BS
 import qualified Data.ByteString.Lazy as LBS
 import           Data.ByteString.Lazy.Internal (smallChunkSize)
-import           Data.Time.Clock (DiffTime)
 import           Numeric.Natural
 
 import qualified System.IO as IO

diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
@@ -151,7 +151,6 @@ library
                        serialise         >=0.2 && <0.3,
                        random,
                        stm               >=2.4 && <2.6,
-                       time              >=1.6 && <1.11,
 
                        cardano-binary,
                        cardano-prelude,
@@ -287,7 +286,6 @@ test-suite test-network
                        tasty-hunit,
                        tasty-quickcheck,
                        text,
-                       time,
 
                        cardano-binary,
                        cardano-prelude,

diff --git a/ouroboros-network/src/Ouroboros/Network/DeltaQ.hs b/ouroboros-network/src/Ouroboros/Network/DeltaQ.hs
@@ -36,8 +36,7 @@ module Ouroboros.Network.DeltaQ (
     fromSample
   ) where
 
-import           Control.Monad.Class.MonadTime (Time (..), diffTime)
-import           Data.Time.Clock (DiffTime)
+import           Control.Monad.Class.MonadTime (DiffTime, Time (..), diffTime)
 import           Data.Word (Word32)
 
 

diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs b/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs
@@ -95,7 +95,6 @@ import qualified Data.ByteString.Lazy as BL
 import           Data.Functor.Identity (Identity (..))
 import           Data.Functor.Contravariant (contramap)
 import           Data.Kind (Type)
-import           Data.Time.Clock
 import           Data.Void (Void)
 import qualified Codec.CBOR.Read as CBOR
 import qualified Codec.CBOR.Term as CBOR

diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs b/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs
@@ -93,11 +93,11 @@ module Ouroboros.Network.NodeToNode (
 
 import           Control.Monad.Class.MonadST
 import           Control.Monad.Class.MonadSTM
+import           Control.Monad.Class.MonadTime (DiffTime)
 import qualified Control.Concurrent.Async as Async
 import           Control.Exception (IOException)
 
 import qualified Data.ByteString.Lazy as BL
-import           Data.Time.Clock (DiffTime)
 import           Data.Void (Void)
 import           Data.Word
 import qualified Codec.CBOR.Read as CBOR

diff --git a/ouroboros-network/test/Ouroboros/Network/MockNode.hs b/ouroboros-network/test/Ouroboros/Network/MockNode.hs
@@ -22,7 +22,6 @@ import           Data.Hashable
 import           Data.List hiding (inits)
 import           Data.Maybe (catMaybes)
 import           Data.Tuple (swap)
-import           Data.Time (DiffTime)
 import           GHC.Generics (Generic)
 
 import           Control.Monad.Class.MonadFork

diff --git a/ouroboros-network/test/Test/PeerState.hs b/ouroboros-network/test/Test/PeerState.hs
@@ -20,7 +20,6 @@ import           Data.Functor (void)
 import           Data.Monoid (First (..))
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
-import           Data.Time.Clock (secondsToDiffTime)
 import           Text.Printf
 
 import           Control.Monad.Class.MonadAsync
@@ -69,7 +68,7 @@ genSuspendDecision gen = oneof
     ]
 
 genDiffTime :: Gen DiffTime
-genDiffTime = secondsToDiffTime <$> arbitrary
+genDiffTime = fromIntegral @Int <$> arbitrary
 
 instance Arbitrary t => Arbitrary (ArbSuspendDecision t) where
     arbitrary = ArbSuspendDecision <$> genSuspendDecision arbitrary

diff --git a/ouroboros-network/test/Test/Socket.hs b/ouroboros-network/test/Test/Socket.hs
@@ -12,14 +12,14 @@ module Test.Socket (tests) where
 
 import qualified Data.ByteString.Lazy as BL
 
-import           Data.Time.Clock (UTCTime, getCurrentTime)
 import           Data.Void (Void)
 import qualified Network.Socket as Socket
 
 import           Control.Monad
 import           Control.Monad.Class.MonadAsync
 import           Control.Monad.Class.MonadFork hiding (ThreadId)
 import           Control.Monad.Class.MonadSTM.Strict
+import           Control.Monad.Class.MonadTime
 import           Control.Monad.Class.MonadTimer
 import           Control.Concurrent (ThreadId)
 import           Control.Tracer

diff --git a/typed-protocols-examples/src/Network/TypedProtocol/Channel.hs b/typed-protocols-examples/src/Network/TypedProtocol/Channel.hs
@@ -25,7 +25,6 @@ import           Control.Monad.Class.MonadTimer
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as LBS
 import           Data.ByteString.Lazy.Internal (smallChunkSize)
-import           Data.Time.Clock (DiffTime)
 import           Numeric.Natural
 
 import qualified System.IO as IO