From bf4166e618e0b4850c5bba5c6f81e29e099b60e4 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 29 Jul 2016 13:18:08 -0700 Subject: [PATCH] remove duplicated threadDelaySecs function (#56) --- bench/Bench.hs | 4 +--- tests/LowLevelTests.hs | 4 +--- tests/UnsafeTests.hs | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bench/Bench.hs b/bench/Bench.hs index 27b6497..03dd53f 100644 --- a/bench/Bench.hs +++ b/bench/Bench.hs @@ -18,6 +18,7 @@ import GHC.Generics (Generic) import Network.GRPC.HighLevel.Server hiding (serverLoop) import Network.GRPC.HighLevel.Server.Unregistered (serverLoop) import Network.GRPC.LowLevel +import Network.GRPC.LowLevel.GRPC (threadDelaySecs) import System.Random (randomRIO) data AddRequest = AddRequest {addX :: Fixed Word32 @@ -94,9 +95,6 @@ serverOpts = , optServerStreamHandlers = [addServerStreamHandler] , optBiDiStreamHandlers = [addBiDiHandler]} -threadDelaySecs :: Int -> IO () -threadDelaySecs = threadDelay . (* 10^(6::Int)) - main :: IO () main = bracket startServer stopServer $ const $ withGRPC $ \grpc -> withClient grpc (ClientConfig "localhost" 50051 []) $ \c -> do diff --git a/tests/LowLevelTests.hs b/tests/LowLevelTests.hs index e3d1493..44f50ac 100644 --- a/tests/LowLevelTests.hs +++ b/tests/LowLevelTests.hs @@ -21,6 +21,7 @@ import Data.ByteString (ByteString, isSuffixOf) import qualified Data.Map as M import Network.GRPC.LowLevel +import Network.GRPC.LowLevel.GRPC (threadDelaySecs) import qualified Network.GRPC.LowLevel.Call.Unregistered as U import qualified Network.GRPC.LowLevel.Client.Unregistered as U import qualified Network.GRPC.LowLevel.Server.Unregistered as U @@ -609,9 +610,6 @@ serverConf (ns, cs, ss, bs) = methodsToRegisterServerStreaming = ss, methodsToRegisterBiDiStreaming = bs} -threadDelaySecs :: Int -> IO () -threadDelaySecs = threadDelay . (* 10^(6::Int)) - mgdGRPC :: Managed GRPC mgdGRPC = managed withGRPC diff --git a/tests/UnsafeTests.hs b/tests/UnsafeTests.hs index 54686f3..b051ca4 100644 --- a/tests/UnsafeTests.hs +++ b/tests/UnsafeTests.hs @@ -8,6 +8,7 @@ import Control.Monad import qualified Data.ByteString as B import Foreign.Marshal.Alloc import Foreign.Storable +import Network.GRPC.LowLevel.GRPC (threadDelaySecs) import Network.GRPC.Unsafe import Network.GRPC.Unsafe.ByteBuffer import Network.GRPC.Unsafe.Metadata @@ -126,8 +127,5 @@ assertCqEventComplete e = do grpc :: IO a -> IO () grpc = bracket_ grpcInit grpcShutdown . void -threadDelaySecs :: Int -> IO () -threadDelaySecs = threadDelay . (* 10^(6::Int)) - _nowarnUnused :: a _nowarnUnused = assertCqEventComplete `undefined` threadDelaySecs