Marshall AnnounceKey as raw ByteString.

1 files changed, 8 insertions, 3 deletions

diff --git a/dht/Announcer.hs b/dht/Announcer.hs
index 41f86f24..98fcdf94 100644
--- a/dht/Announcer.hs
+++ b/dht/Announcer.hs
@@ -13,6 +13,8 @@ module Announcer
     , scheduleToList
     , packAnnounceKey
     , unpackAnnounceKey
+    , encodeAnnounceKey
+    , decodeAnnounceKey
     , forkAnnouncer
     , stopAnnouncer
     , cancel
@@ -44,15 +46,18 @@ import qualified GHC.Generics               as Generics
 newtype AnnounceKey = AnnounceKey ByteString
  deriving (Hashable,Ord,Eq)
 
--- instance Show AnnounceKey where
---    show (AnnounceKey bs) = "AnnounceKey " ++ show (Char8.unpack bs)
-
 packAnnounceKey :: Announcer -> String -> AnnounceKey
 packAnnounceKey _ = AnnounceKey . Char8.pack
 
 unpackAnnounceKey :: Announcer -> AnnounceKey -> String
 unpackAnnounceKey _ (AnnounceKey bs) = Char8.unpack bs
 
+encodeAnnounceKey :: Announcer -> AnnounceKey -> ByteString
+encodeAnnounceKey _ (AnnounceKey k) = k
+
+decodeAnnounceKey :: Announcer -> ByteString -> AnnounceKey
+decodeAnnounceKey _ k = AnnounceKey k
+
 -- | Actions that can be scheduled to occur at some particular time in the
 -- future.  Since periodic event handlers are responsible for re-scheduling
 -- themselves, they are typically bootstrapped using 'scheduleImmediately' with