fix test suites

Author: ProofOfKeags

bitcoin.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -134,6 +134,7 @@ test-suite spec
       Bitcoin.Keys.MnemonicSpec
       Bitcoin.KeysSpec
       Bitcoin.NetworkSpec
+      Bitcoin.Orphans
       Bitcoin.ScriptSpec
       Bitcoin.Transaction.PartialSpec
       Bitcoin.Transaction.TaprootSpec

data/test_vectors_aserti3-2d_run01.txt renamed to data/test_vectors_asserti3-2d_run01.txt

@@ -1,7 +1,7 @@
 cradle:
-  stack:
-    - path: "./src"
-      component: "bitcoin:lib"
+  cabal:
+    - path: "src"
+      component: "lib:bitcoin"
 
-    - path: "./test"
+    - path: "test"
       component: "bitcoin:test:spec"

data/test_vectors_aserti3-2d_run02.txt renamed to data/test_vectors_asserti3-2d_run02.txt

@@ -45,7 +45,7 @@ module Bitcoin.Block.Headers (
     bip34,
     validVersion,
     lastNoMinDiff,
-    computeAsertBits,
+    computeAssertBits,
     nextPowWorkRequired,
     calcNextWork,
     isValidPOW,
@@ -677,13 +677,13 @@ maxTarget :: Integer
 maxTarget = fst $ decodeCompact maxBits
 
 
-computeAsertBits ::
+computeAssertBits ::
     Integer ->
     Word32 ->
     Integer ->
     Integer ->
     Word32
-computeAsertBits halflife anchor_bits time_diff height_diff =
+computeAssertBits halflife anchor_bits time_diff height_diff =
     if e2 >= 0 && e2 < 65536
         then
             if g4 == 0

data/test_vectors_aserti3-2d_run03.txt renamed to data/test_vectors_asserti3-2d_run03.txt

@@ -9,8 +9,9 @@ import Bitcoin.Data
 import Bitcoin.Keys
 import Bitcoin.Util
 import Bitcoin.Util.Arbitrary
-import Bitcoin.UtilSpec
+import Bitcoin.UtilSpec hiding (spec)
 import Data.Aeson
+import Data.Aeson.Encoding
 import Data.Aeson.Types (Parser)
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as BS (append, empty, pack)
@@ -27,6 +28,24 @@ import Test.Hspec.QuickCheck
 import Test.QuickCheck
 
 
+addrToJSON :: Network -> Address -> Value
+addrToJSON net a = toJSON (addrToText net a)
+
+
+addrToEncoding :: Network -> Address -> Encoding
+addrToEncoding net = maybe null_ text . addrToText net
+
+
+-- | JSON parsing for Bitcoin addresses. Works with 'Base58', and
+-- 'Bech32'.
+addrFromJSON :: Network -> Value -> Parser Address
+addrFromJSON net =
+    withText "address" $ \t ->
+        case textToAddr net t of
+            Nothing -> fail "could not decode address"
+            Just x -> return x
+
+
 serialVals :: [SerialBox]
 serialVals = [SerialBox arbitraryAddressAll]
 
@@ -40,7 +59,6 @@ netVals =
     [NetBox (addrToJSON, addrToEncoding, addrFromJSON, arbitraryNetAddress)]
 
 
-
 spec :: Spec
 spec = do
     testIdentity serialVals readVals [] netVals

data/test_vectors_aserti3-2d_run04.txt renamed to data/test_vectors_asserti3-2d_run04.txt

@@ -7,10 +7,19 @@ module Bitcoin.BlockSpec (
 import Bitcoin.Block
 import Bitcoin.Constants
 import Bitcoin.Data
+import Bitcoin.Orphans ()
 import Bitcoin.Transaction
+import Bitcoin.Util
 import Bitcoin.Util.Arbitrary
 import Bitcoin.UtilSpec hiding (spec)
+import Control.Monad (MonadPlus (..), forM_, unless, (<=<))
 import Control.Monad.Trans.State.Strict
+import Data.Aeson
+import Data.Aeson.Encoding
+import qualified Data.ByteString.Lazy as BL
+import Data.Bytes.Get
+import Data.Bytes.Put (runPutL, runPutS)
+import Data.Bytes.Serial
 import Data.Either (fromRight)
 import Data.Maybe (fromJust)
 import Data.String (fromString)
@@ -96,11 +105,11 @@ spec = do
     describe "compact number" $ do
         it "compact number local vectors" testCompact
         it "compact number imported vectors" testCompactBitcoinCore
-    describe "asert" $
+    describe "assert" $
         mapM_
             ( \x ->
-                asertTests $
-                    "test_vectors_aserti3-2d_run" ++ printf "%02d" x ++ ".txt"
+                assertTests $
+                    "test_vectors_asserti3-2d_run" ++ printf "%02d" x ++ ".txt"
             )
             [(1 :: Int) .. 12]
     describe "helper functions" $ do
@@ -378,42 +387,42 @@ testSubsidy net = go (2 * 50 * 100 * 1000 * 1000) 0
                 go subsidy (halvings + 1)
 
 
-data AsertBlock = AsertBlock Int Integer Integer Word32
+data AssertBlock = AssertBlock Int Integer Integer Word32
 
 
-data AsertVector = AsertVector String Integer Integer Word32 [AsertBlock]
+data AssertVector = AssertVector String Integer Integer Word32 [AssertBlock]
 
 
-readAsertVector :: FilePath -> IO AsertVector
-readAsertVector p = do
+readAssertVector :: FilePath -> IO AssertVector
+readAssertVector p = do
     (d : ah : apt : ab : _ : _ : _ : _ : xs) <- lines <$> readFile ("data/" ++ p)
     let desc = drop 16 d
         anchor_height = read (words ah !! 3)
         anchor_parent_time = read (words apt !! 4)
         anchor_nbits = read (words ab !! 3)
         blocks = map (f . words) (init xs)
     return $
-        AsertVector
+        AssertVector
             desc
             anchor_height
             anchor_parent_time
             anchor_nbits
             blocks
   where
-    f [i, h, t, g] = AsertBlock (read i) (read h) (read t) (read g)
+    f [i, h, t, g] = AssertBlock (read i) (read h) (read t) (read g)
     f _ = undefined
 
 
-asertTests :: FilePath -> SpecWith ()
-asertTests file = do
-    v@(AsertVector d _ _ _ _) <- runIO $ readAsertVector file
-    it d $ testAsertBits v
+assertTests :: FilePath -> SpecWith ()
+assertTests file = do
+    v@(AssertVector d _ _ _ _) <- runIO $ readAssertVector file
+    it d $ testAssertBits v
 
 
-testAsertBits :: AsertVector -> Assertion
-testAsertBits (AsertVector _ anchor_height anchor_parent_time anchor_bits blocks) =
-    forM_ blocks $ \(AsertBlock _ h t g) ->
-        computeAsertBits
+testAssertBits :: AssertVector -> Assertion
+testAssertBits (AssertVector _ anchor_height anchor_parent_time anchor_bits blocks) =
+    forM_ blocks $ \(AssertBlock _ h t g) ->
+        computeAssertBits
             (2 * 24 * 60 * 60)
             anchor_bits
             (t - anchor_parent_time)

data/test_vectors_aserti3-2d_run05.txt renamed to data/test_vectors_asserti3-2d_run05.txt

@@ -3,8 +3,17 @@
 
 module Bitcoin.Keys.ExtendedSpec (spec) where
 
+import Bitcoin.Address
+import Bitcoin.Constants
+import Bitcoin.Keys
+import Bitcoin.Orphans ()
+import Bitcoin.Util
+import Bitcoin.Util.Arbitrary
+import Bitcoin.UtilSpec (JsonBox (..), NetBox (..), ReadBox (..), SerialBox (..), customCerealID, testIdentity)
 import Control.Monad (forM_)
 import Data.Aeson as A
+import Data.Aeson.Encoding
+import Data.Aeson.Types
 import Data.Bits ((.&.))
 import qualified Data.ByteString.Lazy.Char8 as B8
 import Data.Bytes.Get
@@ -16,12 +25,6 @@ import Data.String (fromString)
 import Data.String.Conversions (cs)
 import Data.Text (Text)
 import Data.Word (Word32)
-import Bitcoin.Address
-import Bitcoin.Constants
-import Bitcoin.Keys
-import Bitcoin.Util
-import Bitcoin.Util.Arbitrary
-import Bitcoin.UtilSpec (customCerealID)
 import Test.HUnit (Assertion, assertBool, assertEqual)
 import Test.Hspec
 import Test.Hspec.QuickCheck
@@ -72,6 +75,27 @@ netVals =
         , genNetData (snd <$> arbitraryXPubKey)
         )
     ]
+  where
+    xPrvToJSON :: Network -> XPrvKey -> Value
+    xPrvToJSON net = A.String . xPrvExport net
+    xPrvToEncoding :: Network -> XPrvKey -> Encoding
+    xPrvToEncoding net = text . xPrvExport net
+    xPrvFromJSON :: Network -> Value -> Parser XPrvKey
+    xPrvFromJSON net =
+        withText "xprv" $ \t ->
+            case xPrvImport net t of
+                Nothing -> fail "could not read xprv"
+                Just x -> return x
+    xPubFromJSON :: Network -> Value -> Parser XPubKey
+    xPubFromJSON net =
+        withText "xpub" $ \t ->
+            case xPubImport net t of
+                Nothing -> fail "could not read xpub"
+                Just x -> return x
+    xPubToJSON :: Network -> XPubKey -> Value
+    xPubToJSON net = A.String . xPubExport net
+    xPubToEncoding :: Network -> XPubKey -> Encoding
+    xPubToEncoding net = text . xPubExport net
 
 
 spec :: Spec

data/test_vectors_aserti3-2d_run06.txt renamed to data/test_vectors_asserti3-2d_run06.txt

@@ -2,6 +2,15 @@
 
 module Bitcoin.KeysSpec (spec) where
 
+import Bitcoin.Address
+import Bitcoin.Constants
+import Bitcoin.Crypto
+import Bitcoin.Keys
+import Bitcoin.Orphans ()
+import Bitcoin.Script
+import Bitcoin.Util
+import Bitcoin.Util.Arbitrary
+import Bitcoin.UtilSpec hiding (spec)
 import Control.Lens
 import Control.Monad
 import Data.Aeson as A
@@ -16,14 +25,6 @@ import qualified Data.Serialize as S
 import Data.String (fromString)
 import Data.String.Conversions (cs)
 import Data.Text (Text)
-import Bitcoin.Address
-import Bitcoin.Constants
-import Bitcoin.Crypto
-import Bitcoin.Keys
-import Bitcoin.Script
-import Bitcoin.Util
-import Bitcoin.Util.Arbitrary
-import Bitcoin.UtilSpec (readTestFile)
 import Test.HUnit
 import Test.Hspec
 import Test.Hspec.QuickCheck

data/test_vectors_aserti3-2d_run07.txt renamed to data/test_vectors_asserti3-2d_run07.txt

@@ -9,8 +9,7 @@ import Bitcoin.Network
 import Bitcoin.Transaction
 import Bitcoin.Util
 import Bitcoin.Util.Arbitrary
-import Bitcoin.UtilSpec
-import Bitcoin.UtilSpec (customCerealID)
+import Bitcoin.UtilSpec hiding (spec)
 import Data.Bytes.Get
 import Data.Bytes.Put
 import Data.Bytes.Serial