support newer secp256k1

Author: functora

pub/hs-bitcoin-keys/bitcoin-keys/bitcoin-keys.cabal

@@ -1,51 +1,63 @@
-cabal-version: 2.4
-name: bitcoin-keys
-version: 0.1
-license: Apache-2.0
-license-file: LICENSE
-extra-source-files: README.md CHANGELOG.md
-author: Renzo Carbonara
-maintainer: renλren.zone
-copyright: Copyright (c) Renzo Carbonara 2020
-category: Cryptography
-build-type: Simple
-synopsis: Bitcoin keys
+cabal-version:      2.4
+name:               bitcoin-keys
+version:            0.1
+license:            Apache-2.0
+license-file:       LICENSE
+extra-source-files:
+  CHANGELOG.md
+  README.md
+
+author:             Renzo Carbonara
+maintainer:         renλren.zone
+copyright:          Copyright (c) Renzo Carbonara 2020
+category:           Cryptography
+build-type:         Simple
+synopsis:           Bitcoin keys
 description:
   Bitcoin keys.
   .
   This library builds in GHC and GHCJS.
-homepage: https://gitlab.com/k0001/hs-bitcoin-keys
-bug-reports: https://gitlab.com/k0001/hs-bitcoin-keys/issues
-tested-with: GHC == 8.8.3, GHC == 8.6.5, GHCJS == 8.6.0
+
+homepage:           https://gitlab.com/k0001/hs-bitcoin-keys
+bug-reports:        https://gitlab.com/k0001/hs-bitcoin-keys/issues
+tested-with:
+    GHC ==8.6.5 || ==8.8.3
+  , GHCJS ==8.6.0
 
 common basic
   default-language: Haskell2010
-  ghc-options: -O2 -Wall -Werror=incomplete-patterns
-  ghcjs-options: -O3 -Wall -Werror=incomplete-patterns
-  build-depends: base == 4.*, bytestring
+  ghc-options:      -O2 -Wall -Werror=incomplete-patterns
+  ghcjs-options:    -O3 -Wall -Werror=incomplete-patterns
+  build-depends:
+    , base        >=4 && <5
+    , bytestring
 
 library
-  import: basic
-  hs-source-dirs: lib
+  import:          basic
+  hs-source-dirs:  lib
   exposed-modules: Bitcoin.Keys
-  If impl(ghcjs)
+
+  if impl(ghcjs)
     other-modules: Bitcoin.Keys.GHCJS
     build-depends: ghcjs-base
+
     -- This is file is generated. See README.md.
-    js-sources: js/index.compiled.js
+    js-sources:    js/index.compiled.js
+
   else
     other-modules: Bitcoin.Keys.GHC
     build-depends: secp256k1-haskell
 
 test-suite test
-  import: basic
-  type: exitcode-stdio-1.0
+  import:         basic
+  type:           exitcode-stdio-1.0
   hs-source-dirs: test
-  main-is: Main.hs
+  main-is:        Main.hs
   build-depends:
-    base16-bytestring,
-    hedgehog,
-    bitcoin-keys,
-    tasty,
-    tasty-hedgehog,
-    tasty-hunit,
+    , base16-bytestring
+    , bitcoin-keys
+    , hedgehog
+    , tasty
+    , tasty-hedgehog
+    , tasty-hunit
+    , with-utf8

pub/hs-bitcoin-keys/bitcoin-keys/test/Main.hs

@@ -15,6 +15,7 @@ import Data.Word
 import Hedgehog (MonadGen, forAll, property, (===))
 import qualified Hedgehog.Gen as Gen
 import qualified Hedgehog.Range as Range
+import Main.Utf8 (withUtf8)
 import qualified System.IO as IO
 import Test.Tasty (TestTree, testGroup)
 import qualified Test.Tasty as Tasty
@@ -25,7 +26,7 @@ import qualified Test.Tasty.Runners as Tasty
 --------------------------------------------------------------------------------
 
 main :: IO ()
-main = do
+main = withUtf8 $ do
   IO.hSetBuffering IO.stdout IO.LineBuffering
   IO.hSetBuffering IO.stderr IO.LineBuffering
   Tasty.defaultMainWithIngredients
@@ -197,8 +198,7 @@ pub1u = maybe (error "pub1u") id (S.parsePub pub1u_raw)
 pub1u_raw :: B.ByteString
 pub1u_raw =
   fromBase16
-    "044ed59d3f6548c41172ec26b9144f547185cb2a9f28fccb6e3ae53dc4f1827154\
-    \ba3a12d8b383bfff1dacd6930285f4a51a01ee64e102652d5bc137c49b97815e"
+    "044ed59d3f6548c41172ec26b9144f547185cb2a9f28fccb6e3ae53dc4f1827154ba3a12d8b383bfff1dacd6930285f4a51a01ee64e102652d5bc137c49b97815e"
 
 --------------------------------------------------------------------------------
 -- BIP39 mnemonic: abandon abandon arm
@@ -233,8 +233,7 @@ pub2u = maybe (error "pub2u") id (S.parsePub pub2u_raw)
 pub2u_raw :: B.ByteString
 pub2u_raw =
   fromBase16
-    "0415bd146d8b45383ad431a8204717dc9f46a7a46c1f44eeaab02d49f4511ccff0\
-    \7d7817de34c0a281b45691eec966e95d936554b2320462214cd2a17aebcf460f"
+    "0415bd146d8b45383ad431a8204717dc9f46a7a46c1f44eeaab02d49f4511ccff07d7817de34c0a281b45691eec966e95d936554b2320462214cd2a17aebcf460f"
 
 --------------------------------------------------------------------------------
 -- Randomly generated