removes cereal and binary

Author: ProofOfKeags

bitcoin.cabal

@@ -96,10 +96,8 @@ library
     , array >=0.5.4.0
     , base >=4.9 && <5
     , base16 >=0.3.0.1
-    , binary >=0.8.8
     , bytes >=0.17
     , bytestring >=0.10.10.0
-    , cereal >=0.5.8
     , containers >=0.6.2.1
     , cryptonite >=0.26
     , deepseq >=1.4.4.0
@@ -149,11 +147,9 @@ test-suite spec
     , base >=4.9 && <5
     , base16 >=0.3.0.1
     , base64 ==0.4.*
-    , binary >=0.8.8
     , bitcoin
     , bytes >=0.17
     , bytestring >=0.10.10.0
-    , cereal >=0.5.8
     , containers >=0.6.2.1
     , cryptonite >=0.26
     , deepseq >=1.4.4.0

package.yaml

@@ -22,10 +22,10 @@ dependencies:
   - array >= 0.5.4.0
   - base >=4.9 && <5
   - base16 >= 0.3.0.1
-  - binary >= 0.8.8
+  # - binary >= 0.8.8
   - bytes >= 0.17
   - bytestring >= 0.10.10.0
-  - cereal >= 0.5.8
+  # - cereal >= 0.5.8
   - containers >= 0.6.2.1
   - cryptonite >= 0.26
   - deepseq >= 1.4.4.0

src/Haskoin/Address.hs

@@ -51,15 +51,13 @@ import Control.Applicative
 import Control.Arrow (second)
 import Control.DeepSeq
 import Control.Monad
-import Data.Binary (Binary (..))
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import Data.Bytes.Get
 import Data.Bytes.Put
 import Data.Bytes.Serial
 import Data.Hashable
 import Data.Maybe
-import Data.Serialize (Serialize (..))
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Word (Word8)

src/Haskoin/Constants.hs

@@ -22,14 +22,12 @@ module Haskoin.Constants (
 ) where
 
 import Control.DeepSeq
-import Data.Binary (Binary (..))
 import Data.ByteString (ByteString)
 import Data.Bytes.Get
 import Data.Bytes.Put
 import Data.Bytes.Serial
 import Data.List
 import Data.Maybe
-import Data.Serialize (Serialize (..))
 import Data.String
 import Data.Text (Text)
 import Data.Word (Word32, Word64, Word8)

src/Haskoin/Crypto/Hash.hs

@@ -2,17 +2,16 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TypeApplications #-}
 
-{- |
-Module      : Haskoin.Crypto.Hash
-Copyright   : No rights reserved
-License     : MIT
-Maintainer  : [email protected]
-Stability   : experimental
-Portability : POSIX
-
-Hashing functions and corresponding data types. Uses functions from the
-cryptonite library.
--}
+-- |
+--Module      : Haskoin.Crypto.Hash
+--Copyright   : No rights reserved
+--License     : MIT
+--Maintainer  : [email protected]
+--Stability   : experimental
+--Portability : POSIX
+--
+--Hashing functions and corresponding data types. Uses functions from the
+--cryptonite library.
 module Haskoin.Crypto.Hash (
     -- * Hashes
     Hash512 (getHash512),
@@ -45,7 +44,6 @@ import Crypto.Hash (
     hashWith,
  )
 import Crypto.MAC.HMAC (HMAC, hmac)
-import Data.Binary (Binary (..))
 import Data.ByteArray (ByteArrayAccess)
 import qualified Data.ByteArray as BA
 import Data.ByteString (ByteString)
@@ -57,64 +55,66 @@ import qualified Data.Bytes.Put as Put
 import Data.Bytes.Serial (Serial (..))
 import Data.Either (fromRight)
 import Data.Hashable (Hashable)
-import Data.Serialize (Serialize (..))
 import Data.String (IsString, fromString)
 import Data.String.Conversions (cs)
 import Data.Word (Word32)
 import GHC.Generics (Generic)
 import Haskoin.Util
 import Text.Read as R
 
+
 -- | 'Word32' wrapped for type-safe 32-bit checksums.
 newtype CheckSum32 = CheckSum32
     { getCheckSum32 :: Word32
     }
     deriving (Eq, Ord, Serial, Show, Read, Hashable, Generic, NFData)
 
-instance Serialize CheckSum32 where
-    put = serialize
-    get = deserialize
-
-instance Binary CheckSum32 where
-    put = serialize
-    get = deserialize
 
 -- | Type for 512-bit hashes.
 newtype Hash512 = Hash512 {getHash512 :: ShortByteString}
     deriving (Eq, Ord, Hashable, Generic, NFData)
 
+
 -- | Type for 256-bit hashes.
 newtype Hash256 = Hash256 {getHash256 :: ShortByteString}
     deriving (Eq, Ord, Hashable, Generic, NFData)
 
+
 -- | Type for 160-bit hashes.
 newtype Hash160 = Hash160 {getHash160 :: ShortByteString}
     deriving (Eq, Ord, Hashable, Generic, NFData)
 
+
 instance Show Hash512 where
     showsPrec _ = shows . encodeHex . BSS.fromShort . getHash512
 
+
 instance Read Hash512 where
     readPrec = do
         R.String str <- lexP
         maybe pfail return $ Hash512 . BSS.toShort <$> decodeHex (cs str)
 
+
 instance Show Hash256 where
     showsPrec _ = shows . encodeHex . BSS.fromShort . getHash256
 
+
 instance Read Hash256 where
     readPrec = do
         R.String str <- lexP
         maybe pfail return $ Hash256 . BSS.toShort <$> decodeHex (cs str)
 
+
 instance Show Hash160 where
     showsPrec _ = shows . encodeHex . BSS.fromShort . getHash160
 
+
 instance Read Hash160 where
     readPrec = do
         R.String str <- lexP
         maybe pfail return $ Hash160 . BSS.toShort <$> decodeHex (cs str)
 
+
 instance IsString Hash512 where
     fromString str =
         case decodeHex $ cs str of
@@ -123,20 +123,14 @@ instance IsString Hash512 where
                 case BS.length bs of
                     64 -> Hash512 (BSS.toShort bs)
                     _ -> e
-      where
-        e = error "Could not decode hash from hex string"
+        where
+            e = error "Could not decode hash from hex string"
+
 
 instance Serial Hash512 where
     deserialize = Hash512 . BSS.toShort <$> Get.getByteString 64
     serialize = Put.putByteString . BSS.fromShort . getHash512
 
-instance Serialize Hash512 where
-    put = serialize
-    get = deserialize
-
-instance Binary Hash512 where
-    put = serialize
-    get = deserialize
 
 instance IsString Hash256 where
     fromString str =
@@ -146,20 +140,14 @@ instance IsString Hash256 where
                 case BS.length bs of
                     32 -> Hash256 (BSS.toShort bs)
                     _ -> e
-      where
-        e = error "Could not decode hash from hex string"
+        where
+            e = error "Could not decode hash from hex string"
+
 
 instance Serial Hash256 where
     deserialize = Hash256 . BSS.toShort <$> Get.getByteString 32
     serialize = Put.putByteString . BSS.fromShort . getHash256
 
-instance Serialize Hash256 where
-    put = serialize
-    get = deserialize
-
-instance Binary Hash256 where
-    put = serialize
-    get = deserialize
 
 instance IsString Hash160 where
     fromString str =
@@ -169,47 +157,47 @@ instance IsString Hash160 where
                 case BS.length bs of
                     20 -> Hash160 (BSS.toShort bs)
                     _ -> e
-      where
-        e = error "Could not decode hash from hex string"
+        where
+            e = error "Could not decode hash from hex string"
+
 
 instance Serial Hash160 where
     deserialize = Hash160 . BSS.toShort <$> Get.getByteString 20
     serialize = Put.putByteString . BSS.fromShort . getHash160
 
-instance Serialize Hash160 where
-    put = serialize
-    get = deserialize
-
-instance Binary Hash160 where
-    put = serialize
-    get = deserialize
 
 -- | Calculate SHA512 hash.
 sha512 :: ByteArrayAccess b => b -> Hash512
 sha512 = Hash512 . BSS.toShort . BA.convert . hashWith SHA512
 
+
 -- | Calculate SHA256 hash.
 sha256 :: ByteArrayAccess b => b -> Hash256
 sha256 = Hash256 . BSS.toShort . BA.convert . hashWith SHA256
 
+
 -- | Calculate RIPEMD160 hash.
 ripemd160 :: ByteArrayAccess b => b -> Hash160
 ripemd160 = Hash160 . BSS.toShort . BA.convert . hashWith RIPEMD160
 
+
 -- | Claculate SHA1 hash.
 sha1 :: ByteArrayAccess b => b -> Hash160
 sha1 = Hash160 . BSS.toShort . BA.convert . hashWith SHA1
 
+
 -- | Compute two rounds of SHA-256.
 doubleSHA256 :: ByteArrayAccess b => b -> Hash256
 doubleSHA256 =
     Hash256 . BSS.toShort . BA.convert . hashWith SHA256 . hashWith SHA256
 
+
 -- | Compute SHA-256 followed by RIPMED-160.
 addressHash :: ByteArrayAccess b => b -> Hash160
 addressHash =
     Hash160 . BSS.toShort . BA.convert . hashWith RIPEMD160 . hashWith SHA256
 
+
 {- CheckSum -}
 
 -- | Computes a 32 bit checksum.
@@ -222,24 +210,28 @@ checkSum32 =
         . hashWith SHA256
         . hashWith SHA256
 
+
 {- HMAC -}
 
 -- | Computes HMAC over SHA-512.
 hmac512 :: ByteString -> ByteString -> Hash512
 hmac512 key msg =
     Hash512 $ BSS.toShort $ BA.convert (hmac key msg :: HMAC SHA512)
 
+
 -- | Computes HMAC over SHA-256.
 hmac256 :: (ByteArrayAccess k, ByteArrayAccess m) => k -> m -> Hash256
 hmac256 key msg =
     Hash256 $ BSS.toShort $ BA.convert (hmac key msg :: HMAC SHA256)
 
+
 -- | Split a 'Hash512' into a pair of 'Hash256'.
 split512 :: Hash512 -> (Hash256, Hash256)
 split512 h =
     (Hash256 (BSS.toShort a), Hash256 (BSS.toShort b))
-  where
-    (a, b) = BS.splitAt 32 . BSS.fromShort $ getHash512 h
+    where
+        (a, b) = BS.splitAt 32 . BSS.fromShort $ getHash512 h
+
 
 -- | Join a pair of 'Hash256' into a 'Hash512'.
 join512 :: (Hash256, Hash256) -> Hash512
@@ -248,16 +240,16 @@ join512 (a, b) =
         . BSS.toShort
         $ BSS.fromShort (getHash256 a) `BS.append` BSS.fromShort (getHash256 b)
 
-{- | Initialize tagged hash specified in BIP340
 
-@since 0.21.0
--}
+-- | Initialize tagged hash specified in BIP340
+--
+--@since 0.21.0
 initTaggedHash ::
     -- | Hash tag
     ByteString ->
     Context SHA256
 initTaggedHash tag =
     (`hashUpdates` [hashedTag, hashedTag]) $
         hashInit @SHA256
-  where
-    hashedTag = hashWith SHA256 tag
+    where
+        hashedTag = hashWith SHA256 tag