5 files changed, 12 insertions, 15 deletions

diff --git a/examples/GetTorrent.hs b/examples/GetTorrent.hs
index 5e624fa1..db52263d 100644
--- a/examples/GetTorrent.hs
+++ b/examples/GetTorrent.hs
@@ -52,9 +52,6 @@ programInfo = info (helper <*> paramsParser)
   <> header   "gettorrent - get torrent file by infohash"
    )
 
-fakeTracker :: URI
-fakeTracker = fromJust $ parseURI "http://foo.org"
-
 exchangeTorrent :: PeerAddr IP -> InfoHash -> IO InfoDict
 exchangeTorrent addr ih = do
   pid <- genPeerId
@@ -72,7 +69,7 @@ getTorrent Params {..} = do
     DHT.lookup topic $$ C.mapM_ $ \ peers -> do
       liftIO $ forM_ peers $ \ peer -> do
         infodict <- exchangeTorrent (IPv4 <$> peer) topic
-        let torrent = nullTorrent fakeTracker infodict
+        let torrent = nullTorrent infodict -- TODO add tNodes, tCreated, etc?
         toFile (show topic <.> torrentExt) torrent
         exitSuccess
 
diff --git a/examples/MkTorrent.hs b/examples/MkTorrent.hs
index 9eda3a52..7bf8b513 100644
--- a/examples/MkTorrent.hs
+++ b/examples/MkTorrent.hs
@@ -122,7 +122,7 @@ amendInfo = info (helper <*> parser) modifier
 type Amend = Torrent -> Torrent
 
 fields :: [(Text, IO Amend)]
-fields = [ ("announce",      set announce            <$> askURI)
+fields = [ ("announce",      set announce     . Just <$> askURI)
          , ("comment",       set comment      . Just <$> askFreeform)
          , ("created by",    set createdBy    . Just <$> askFreeform)
          , ("publisher url", set publisherURL . Just <$> askURI)
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index db7f38eb..497a96d3 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -191,7 +191,7 @@ instance Pretty InfoDict where
 
 -- | Metainfo about particular torrent.
 data Torrent = Torrent
-  { tAnnounce     :: !URI
+  { tAnnounce     :: !(Maybe URI)
     -- ^ The URL of the tracker.
 
   , tAnnounceList :: !(Maybe [[URI]])
@@ -215,7 +215,7 @@ data Torrent = Torrent
   , tInfoDict     :: !InfoDict
     -- ^ Info about each content file.
 
-  , tNodes        :: Maybe [NodeAddr ByteString]
+  , tNodes        :: !(Maybe [NodeAddr ByteString])
     -- ^ This key should be set to the /K closest/ nodes in the
     -- torrent generating client's routing table. Alternatively, the
     -- key could be set to a known good 'Network.BitTorrent.Core.Node'
@@ -284,7 +284,7 @@ instance BEncode POSIXTime where
 
 instance BEncode Torrent where
   toBEncode Torrent {..} = toDict $
-       "announce"      .=! tAnnounce
+       "announce"      .=? tAnnounce
     .: "announce-list" .=? tAnnounceList
     .: "comment"       .=? tComment
     .: "created by"    .=? tCreatedBy
@@ -298,7 +298,7 @@ instance BEncode Torrent where
     .: endDict
 
   fromBEncode = fromDict $ do
-    Torrent <$>! "announce"
+    Torrent <$>? "announce"
             <*>? "announce-list"
             <*>? "comment"
             <*>? "created by"
@@ -341,10 +341,10 @@ instance Pretty Torrent where
         "Signature"     <:>? ((text . show) <$> tSignature)
 
 -- | A simple torrent contains only required fields.
-nullTorrent :: URI -> InfoDict -> Torrent
-nullTorrent ann info = Torrent
-    ann  Nothing Nothing Nothing Nothing Nothing
-    info Nothing Nothing Nothing Nothing
+nullTorrent :: InfoDict -> Torrent
+nullTorrent info = Torrent
+    Nothing Nothing Nothing Nothing Nothing Nothing
+    info    Nothing Nothing Nothing Nothing
 
 -- | Mime type of torrent files.
 typeTorrent :: BS.ByteString
diff --git a/src/Data/Torrent/Magnet.hs b/src/Data/Torrent/Magnet.hs
index ae4e134b..ae6a8dc5 100644
--- a/src/Data/Torrent/Magnet.hs
+++ b/src/Data/Torrent/Magnet.hs
@@ -326,7 +326,7 @@ detailedMagnet :: Torrent -> Magnet
 detailedMagnet t @ Torrent {tInfoDict = InfoDict {..}, tAnnounce}
   = (simpleMagnet t)
     { exactLength = Just $ fromIntegral $ contentLength idLayoutInfo
-    , tracker     = Just tAnnounce
+    , tracker     = tAnnounce
     }
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/Client/Swarm.hs b/src/Network/BitTorrent/Client/Swarm.hs
index 1901905c..7fdd1f2f 100644
--- a/src/Network/BitTorrent/Client/Swarm.hs
+++ b/src/Network/BitTorrent/Client/Swarm.hs
@@ -24,7 +24,7 @@ data Swarm = Swarm
 
 newLeecher :: PeerId -> PortNumber -> Torrent -> IO Swarm
 newLeecher pid port Torrent {..} = do
-  tracker <- connect tAnnounce
+  tracker <- connect undefined
   return Swarm
     { swarmTopic   = idInfoHash tInfoDict
     , thisPeerId   = pid