diff --git a/CHANGELOG.md b/CHANGELOG.md index 06bf990c..72ba9d18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## Unreleased +### Changed +- Expose all modules for tests. +- Tests depend on library instead of having access to its source code. +- Use MIT license. + ## 0.13.6 ### Changed - Expose the Arbitrary test instances under Haskoin.Util.Arbitrary diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..af376dd7 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright 2020 Haskoin Developers + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/UNLICENSE b/UNLICENSE deleted file mode 100644 index 68a49daa..00000000 --- a/UNLICENSE +++ /dev/null @@ -1,24 +0,0 @@ -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to diff --git a/haskoin-core.cabal b/haskoin-core.cabal index 1996e0ad..7ce53eee 100644 --- a/haskoin-core.cabal +++ b/haskoin-core.cabal @@ -4,12 +4,12 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 14c9f49e8a8cbf3de72ab19366de7910b9e4f84ea0bf5191e211116e71102f98 +-- hash: 1021b657985752cc782739b6960ee69d9ca79a21602c3e287e77ea7f15e05ffa name: haskoin-core version: 0.13.6 synopsis: Bitcoin & Bitcoin Cash library for Haskell -description: Haskoin Core is a complete Bitcoin and Bitcoin Cash library of functions and data types for Haskell developers. +description: Please see the README on GitHub at category: Bitcoin, Finance, Network homepage: http://github.com/haskoin/haskoin#readme bug-reports: http://github.com/haskoin/haskoin/issues @@ -17,8 +17,8 @@ author: Philippe Laprade, Jean-Pierre Rupp, Matthew Wraith maintainer: jprupp@protonmail.ch -license: PublicDomain -license-file: UNLICENSE +license: MIT +license-file: LICENSE build-type: Simple extra-source-files: data/forkid_script_tests.json @@ -38,38 +38,37 @@ library exposed-modules: Haskoin Haskoin.Address - Haskoin.Block - Haskoin.Constants - Haskoin.Crypto - Haskoin.Keys - Haskoin.Network - Haskoin.Script - Haskoin.Transaction - Haskoin.Util - Haskoin.Util.Arbitrary - other-modules: Haskoin.Address.Base58 Haskoin.Address.Bech32 Haskoin.Address.CashAddr + Haskoin.Block Haskoin.Block.Common Haskoin.Block.Headers Haskoin.Block.Merkle + Haskoin.Constants + Haskoin.Crypto Haskoin.Crypto.Hash Haskoin.Crypto.Signature + Haskoin.Keys Haskoin.Keys.Common Haskoin.Keys.Extended Haskoin.Keys.Mnemonic + Haskoin.Network Haskoin.Network.Bloom Haskoin.Network.Common Haskoin.Network.Message + Haskoin.Script Haskoin.Script.Common Haskoin.Script.SigHash Haskoin.Script.Standard + Haskoin.Transaction Haskoin.Transaction.Builder Haskoin.Transaction.Builder.Sign Haskoin.Transaction.Common Haskoin.Transaction.Partial Haskoin.Transaction.Segwit + Haskoin.Util + Haskoin.Util.Arbitrary Haskoin.Util.Arbitrary.Address Haskoin.Util.Arbitrary.Block Haskoin.Util.Arbitrary.Crypto @@ -79,6 +78,7 @@ library Haskoin.Util.Arbitrary.Script Haskoin.Util.Arbitrary.Transaction Haskoin.Util.Arbitrary.Util + other-modules: Paths_haskoin_core hs-source-dirs: src @@ -131,52 +131,9 @@ test-suite spec Haskoin.Transaction.PartialSpec Haskoin.TransactionSpec Haskoin.UtilSpec - Haskoin - Haskoin.Address - Haskoin.Address.Base58 - Haskoin.Address.Bech32 - Haskoin.Address.CashAddr - Haskoin.Block - Haskoin.Block.Common - Haskoin.Block.Headers - Haskoin.Block.Merkle - Haskoin.Constants - Haskoin.Crypto - Haskoin.Crypto.Hash - Haskoin.Crypto.Signature - Haskoin.Keys - Haskoin.Keys.Common - Haskoin.Keys.Extended - Haskoin.Keys.Mnemonic - Haskoin.Network - Haskoin.Network.Bloom - Haskoin.Network.Common - Haskoin.Network.Message - Haskoin.Script - Haskoin.Script.Common - Haskoin.Script.SigHash - Haskoin.Script.Standard - Haskoin.Transaction - Haskoin.Transaction.Builder - Haskoin.Transaction.Builder.Sign - Haskoin.Transaction.Common - Haskoin.Transaction.Partial - Haskoin.Transaction.Segwit - Haskoin.Util - Haskoin.Util.Arbitrary - Haskoin.Util.Arbitrary.Address - Haskoin.Util.Arbitrary.Block - Haskoin.Util.Arbitrary.Crypto - Haskoin.Util.Arbitrary.Keys - Haskoin.Util.Arbitrary.Message - Haskoin.Util.Arbitrary.Network - Haskoin.Util.Arbitrary.Script - Haskoin.Util.Arbitrary.Transaction - Haskoin.Util.Arbitrary.Util Paths_haskoin_core hs-source-dirs: test - src build-depends: HUnit >=1.6.0.0 , QuickCheck >=2.13.2 @@ -192,6 +149,7 @@ test-suite spec , deepseq >=1.4.4.0 , entropy >=0.4.1.5 , hashable >=1.3.0.0 + , haskoin-core ==0.13.6 , hspec >=2.7.1 , memory >=0.15.0 , mtl >=2.2.2 diff --git a/package.yaml b/package.yaml index 7c275244..921fc942 100644 --- a/package.yaml +++ b/package.yaml @@ -1,15 +1,15 @@ name: haskoin-core -version: 0.13.6 +version: &version 0.13.6 synopsis: Bitcoin & Bitcoin Cash library for Haskell -description: 'Haskoin Core is a complete Bitcoin and Bitcoin Cash library of functions and data types for Haskell developers.' +description: Please see the README on GitHub at category: Bitcoin, Finance, Network author: - Philippe Laprade - Jean-Pierre Rupp - Matthew Wraith maintainer: jprupp@protonmail.ch -license: PublicDomain -license-file: UNLICENSE +license: MIT +license-file: LICENSE homepage: http://github.com/haskoin/haskoin#readme git: git://github.com/haskoin/haskoin.git bug-reports: http://github.com/haskoin/haskoin/issues @@ -47,28 +47,15 @@ dependencies: vector: ">= 0.12.1.2" library: source-dirs: src - exposed-modules: - - Haskoin - - Haskoin.Address - - Haskoin.Block - - Haskoin.Constants - - Haskoin.Crypto - - Haskoin.Keys - - Haskoin.Network - - Haskoin.Script - - Haskoin.Transaction - - Haskoin.Util - - Haskoin.Util.Arbitrary tests: spec: main: Spec.hs - source-dirs: - - test - - src + source-dirs: test verbatim: build-tool-depends: hspec-discover:hspec-discover dependencies: + haskoin-core: *version hspec: ">= 2.7.1" HUnit: ">= 1.6.0.0" QuickCheck: ">= 2.13.2" diff --git a/stack.yaml b/stack.yaml index 66b08a07..c5920134 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,7 @@ -resolver: lts-15.11 +resolver: lts-16.0 nix: packages: - secp256k1 - pkg-config extra-deps: - - secp256k1-haskell-0.2.1 + - secp256k1-haskell-0.2.4 diff --git a/stack.yaml.lock b/stack.yaml.lock index edd6788b..ff6343f5 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,15 +5,15 @@ packages: - completed: - hackage: secp256k1-haskell-0.2.1@sha256:f923d9b68c822f4bd21c559e024607672e43d37f466f881f11c192c51ac94ba2,2342 + hackage: secp256k1-haskell-0.2.4@sha256:bf265758aee92ff813fd8cdf1dd8a7865deea8f452f666868694127da4f67bb7,2640 pantry-tree: - size: 603 - sha256: f0b9d9a08430dcff34bd3b543e68ecc52297bb13ea652511d454f1d25a104b46 + size: 601 + sha256: 0b42588cda4130d4216fd10b72a06f42c0d8c77d9d9c36b6029d303c2f0ea238 original: - hackage: secp256k1-haskell-0.2.1 + hackage: secp256k1-haskell-0.2.4 snapshots: - completed: - size: 494638 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/11.yaml - sha256: 5747328cdcbb8fe9c96fc048b5566167c80dd176a41b52d3b363058e3cc1dc5d - original: lts-15.11 + size: 531237 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/0.yaml + sha256: 210e15b7043e2783115afe16b0d54914b1611cdaa73f3ca3ca7f8e0847ff54e5 + original: lts-16.0