Rename startNode to newNode

5 files changed, 14 insertions, 14 deletions

diff --git a/src/Network/BitTorrent/Client.hs b/src/Network/BitTorrent/Client.hs
index 905d3384..bd4993ba 100644
--- a/src/Network/BitTorrent/Client.hs
+++ b/src/Network/BitTorrent/Client.hs
@@ -98,8 +98,8 @@ initClient opts @ Options {..} logFun = do
   let mkEx = Exchange.newManager (exchangeOptions pid opts) (connHandler tmap)
   (_, emgr) <- allocate mkEx Exchange.closeManager
 
-  let mkNode = startNode defaultHandlers def optNodeAddr logFun
-  (_, node) <- allocate mkNode stopNode
+  let mkNode = DHT.newNode defaultHandlers def optNodeAddr logFun
+  (_, node) <- allocate mkNode DHT.closeNode
 
   resourceMap <- getInternalState
   return Client
diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs
index ed42363f..44c55128 100644
--- a/src/Network/BitTorrent/DHT.hs
+++ b/src/Network/BitTorrent/DHT.hs
@@ -44,8 +44,8 @@ module Network.BitTorrent.DHT
        , LogFun
        , Node
        , defaultHandlers
-       , startNode
-       , stopNode
+       , newNode
+       , closeNode
 
          -- ** Monad
        , MonadDHT (..)
@@ -86,7 +86,7 @@ dht :: Address ip
     -> IO a        -- ^ result.
 dht opts addr action = do
   runStderrLoggingT $ LoggingT $ \ logger -> do
-    bracket (startNode defaultHandlers opts addr logger) stopNode $
+    bracket (newNode defaultHandlers opts addr logger) closeNode $
       \ node -> runDHT node action
 {-# INLINE dht #-}
 
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index 69970918..43bd65e5 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -33,8 +33,8 @@ module Network.BitTorrent.DHT.Session
          -- ** Initialization
        , LogFun
        , NodeHandler
-       , startNode
-       , stopNode
+       , newNode
+       , closeNode
 
          -- * DHT
          -- | Use @asks options@ to get options passed to 'startNode'
@@ -294,13 +294,13 @@ type NodeHandler ip = Handler (DHT ip)
 -- | Run DHT session. You /must/ properly close session using
 -- 'stopNode' function, otherwise socket or other scarce resources may
 -- leak.
-startNode :: Address ip
+newNode :: Address ip
           => [NodeHandler ip] -- ^ handlers to run on accepted queries;
           -> Options          -- ^ various dht options;
           -> NodeAddr ip      -- ^ node address to bind;
           -> LogFun           -- ^
           -> IO (Node ip)     -- ^ a new DHT node running at given address.
-startNode hs opts naddr logger = do
+newNode hs opts naddr logger = do
     s <- createInternalState
     runInternalState initNode s
       `onException` closeInternalState s
@@ -323,8 +323,8 @@ startNode hs opts naddr logger = do
 
 -- | Some resources like listener thread may live for
 -- some short period of time right after this DHT session closed.
-stopNode :: Node ip -> IO ()
-stopNode Node {..} = closeInternalState resources
+closeNode :: Node ip -> IO ()
+closeNode Node {..} = closeInternalState resources
 
 -- | Run DHT operation on the given session.
 runDHT :: Node ip -> DHT ip a -> IO a
diff --git a/tests/Network/BitTorrent/DHT/QuerySpec.hs b/tests/Network/BitTorrent/DHT/QuerySpec.hs
index b89ce4ff..33114b40 100644
--- a/tests/Network/BitTorrent/DHT/QuerySpec.hs
+++ b/tests/Network/BitTorrent/DHT/QuerySpec.hs
@@ -28,7 +28,7 @@ nullLogger _ _ _ _ = return ()
 
 simpleDHT :: [NodeHandler IPv4] -> DHT IPv4 a -> IO a
 simpleDHT hs m =
-  bracket (startNode hs def myAddr nullLogger) stopNode $ \ node ->
+  bracket (newNode hs def myAddr nullLogger) closeNode $ \ node ->
     runDHT node m
 
 getBootInfo :: IO (NodeInfo IPv4)
diff --git a/tests/Network/BitTorrent/DHT/SessionSpec.hs b/tests/Network/BitTorrent/DHT/SessionSpec.hs
index 41852763..b3b9a9fc 100644
--- a/tests/Network/BitTorrent/DHT/SessionSpec.hs
+++ b/tests/Network/BitTorrent/DHT/SessionSpec.hs
@@ -39,10 +39,10 @@ spec :: Spec
 spec = do
   describe "session" $ do
     it "is active until stopNode called" $ do
-      node <- startNode [] def myAddr nullLogger
+      node <- newNode [] def myAddr nullLogger
       runDHT node monadActive `shouldReturn` True
       runDHT node monadActive `shouldReturn` True
-      stopNode node
+      closeNode node
       runDHT node monadActive `shouldReturn` False
 
   describe "tokens" $ do