From 18d45f6634019800c5fbca6719441758218c2acd Mon Sep 17 00:00:00 2001 From: Lars Kuhtz Date: Fri, 31 Jul 2020 10:46:20 -0700 Subject: [PATCH] update pact pin to latest pact version (#1129) * update pact pin * compile bench component with -Wall * update sbv and pact pin stack.yaml * update nix kpkgs pin * remove unused definition Co-authored-by: Doug Beardsley --- bench/Chainweb/Pact/Backend/Bench.hs | 3 --- bench/Chainweb/Pact/Backend/ForkingBench.hs | 9 --------- cabal.project | 2 +- chainweb.cabal | 1 + dep/kpkgs/default.nix | 8 +------- dep/kpkgs/github.json | 4 ++-- dep/kpkgs/thunk.nix | 9 +++++++++ stack.yaml | 4 ++-- 8 files changed, 16 insertions(+), 24 deletions(-) create mode 100644 dep/kpkgs/thunk.nix diff --git a/bench/Chainweb/Pact/Backend/Bench.hs b/bench/Chainweb/Pact/Backend/Bench.hs index 46ab7c62bc..ad933ef21d 100644 --- a/bench/Chainweb/Pact/Backend/Bench.hs +++ b/bench/Chainweb/Pact/Backend/Bench.hs @@ -48,8 +48,6 @@ import Chainweb.Version v :: ChainwebVersion v = FastTimedCPM petersonChainGraph -cid = unsafeChainId 0 - bench :: C.Benchmark bench = C.bgroup "pact-backend" $ play [ pactSqliteWithBench False . benchUserTable @@ -103,7 +101,6 @@ cpWithBench torun = C.envWithCleanup setup teardown $ \ ~(NoopNFData (_,e,_)) -> C.bgroup name (benches e) where - name = "batchedCheckpointer" cid = unsafeChainId 0 diff --git a/bench/Chainweb/Pact/Backend/ForkingBench.hs b/bench/Chainweb/Pact/Backend/ForkingBench.hs index cea15553a9..fa8dbeb14e 100644 --- a/bench/Chainweb/Pact/Backend/ForkingBench.hs +++ b/bench/Chainweb/Pact/Backend/ForkingBench.hs @@ -27,7 +27,6 @@ import qualified Criterion.Main as C import Data.Aeson hiding (Error) import Data.Bool -import Data.Bytes.Put import Data.ByteString (ByteString) import qualified Data.ByteString as B import qualified Data.ByteString.Short as BS @@ -80,15 +79,12 @@ import Pact.Types.Util hiding (unwrap) -- chainweb imports import Chainweb.BlockCreationTime -import Chainweb.BlockHash import Chainweb.BlockHeader import Chainweb.BlockHeader.Genesis import Chainweb.BlockHeaderDB import Chainweb.BlockHeaderDB.Internal -import Chainweb.BlockHeight import Chainweb.Cut.Create import Chainweb.ChainId -import Chainweb.Difficulty import Chainweb.Graph import Chainweb.Logger import Chainweb.Miner.Core @@ -113,9 +109,6 @@ import Chainweb.Version.Utils import Data.CAS.HashMap hiding (toList) import Data.CAS.RocksDB -import Numeric.Additive -import Numeric.AffineSpace - _run :: [String] -> IO () _run args = withArgs args $ C.defaultMain [bench] @@ -251,8 +244,6 @@ mineBlock parent nonce pdb bhdb r = do nonce creationTime parent - hbytes = HeaderBytes . runPutS $ encodeBlockHeaderWithoutHash bh - tbytes = TargetBytes . runPutS . encodeHashTarget $ _blockTarget bh work = WorkHeader { _workHeaderBytes = BS.toShort $ runPut $ encodeBlockHeaderWithoutHash bh , _workHeaderChainId = _chainId bh diff --git a/cabal.project b/cabal.project index 6ff9b0da80..ee0bb2f1c1 100644 --- a/cabal.project +++ b/cabal.project @@ -11,7 +11,7 @@ debug-info: True source-repository-package type: git location: https://github.com/kadena-io/pact.git - tag: 2ca4cae3eb8a0ef2783aa9457388c31b44a0dfbc + tag: 94cfeb57e2f90c299fc27cc3e72f6b6aa9109c06 source-repository-package type: git diff --git a/chainweb.cabal b/chainweb.cabal index 32ba87c35c..378d29b5c8 100644 --- a/chainweb.cabal +++ b/chainweb.cabal @@ -734,6 +734,7 @@ executable cwtool benchmark bench + import: warning-flags, debugging-flags default-language: Haskell2010 ghc-options: -threaded diff --git a/dep/kpkgs/default.nix b/dep/kpkgs/default.nix index 0cf822e338..2b4d4ab111 100644 --- a/dep/kpkgs/default.nix +++ b/dep/kpkgs/default.nix @@ -1,8 +1,2 @@ # DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; -in import (fetch (builtins.fromJSON (builtins.readFile ./github.json))) +import (import ./thunk.nix) \ No newline at end of file diff --git a/dep/kpkgs/github.json b/dep/kpkgs/github.json index 992b7f77a5..e738555726 100644 --- a/dep/kpkgs/github.json +++ b/dep/kpkgs/github.json @@ -3,6 +3,6 @@ "repo": "kpkgs", "branch": "master", "private": false, - "rev": "8c15564d689258ff87539bc7609e1fcfee51a2bf", - "sha256": "0whz8xas9drzl4bd65qzlw2k89pp07ixcahr78fj3vkryn7bq85r" + "rev": "1d9aaba04ec2f7cdeaafe9687fc4822998a411af", + "sha256": "0rn4kjlxbfj3336rwrwcvfavf7y7a9hmgsm5hd1mdqw86haxjhga" } diff --git a/dep/kpkgs/thunk.nix b/dep/kpkgs/thunk.nix new file mode 100644 index 0000000000..bbf2dc18fb --- /dev/null +++ b/dep/kpkgs/thunk.nix @@ -0,0 +1,9 @@ +# DO NOT HAND-EDIT THIS FILE +let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: + if !fetchSubmodules && !private then builtins.fetchTarball { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; + } else (import {}).fetchFromGitHub { + inherit owner repo rev sha256 fetchSubmodules private; + }; + json = builtins.fromJSON (builtins.readFile ./github.json); +in fetch json \ No newline at end of file diff --git a/stack.yaml b/stack.yaml index e346ee9f5c..5b8624ba94 100644 --- a/stack.yaml +++ b/stack.yaml @@ -32,13 +32,13 @@ extra-deps: - direct-sqlite-2.3.26 - ed25519-donna-0.1.1 - prettyprinter-1.6.0 - - sbv-8.6 + - sbv-8.7 - github: kadena-io/thyme commit: 6ee9fcb026ebdb49b810802a981d166680d867c9 # --- Custom Pins --- # - github: kadena-io/pact - commit: 2ca4cae3eb8a0ef2783aa9457388c31b44a0dfbc + commit: 94cfeb57e2f90c299fc27cc3e72f6b6aa9109c06 - github: kadena-io/chainweb-storage commit: 07e7eb7596c7105aee42dbdb6edd10e3f23c0d7e - github: kadena-io/rosetta