Merge branch 'lars/fix/db-pruning' into release-candidate/2.1

kadena-io · Aug 7, 2020 · 2faee49 · 2faee49
2 parents d0cb041 + 00f838c
commit 2faee49
Show file tree

Hide file tree

Showing 8 changed files with 670 additions and 190 deletions.
diff --git a/chainweb.cabal b/chainweb.cabal
@@ -158,6 +158,7 @@ library
         , Chainweb.Chainweb.CutResources
         , Chainweb.Chainweb.MinerResources
         , Chainweb.Chainweb.PeerResources
+        , Chainweb.Chainweb.PruneChainDatabase
         , Chainweb.Counter
         , Chainweb.Crypto.MerkleLog
         , Chainweb.Cut
@@ -317,7 +318,6 @@ library
         , base64-bytestring >= 1.0 && < 1.1
             -- due to change in error message that is inlined in pact
         , binary >= 0.8
-        , bloomfilter >= 2.0
         , bytes >= 0.15
         , bytestring >= 0.10
         , case-insensitive >= 1.2
@@ -329,6 +329,7 @@ library
         , connection >=0.2
         , containers >= 0.5
         , cryptonite >= 0.25
+        , cuckoo >= 0.2
         , data-default >=0.7
         , data-dword >= 0.3
         , deepseq >= 1.4

diff --git a/project.nix b/project.nix
@@ -19,6 +19,16 @@ proj = kpkgs.rp.project ({ pkgs, hackGet, ... }: with pkgs.haskell.lib;
     overrides = self: super: {
       chainweb = enableCabalFlag (
         justStaticExecutables (enableDWARFDebugging (convertCabalTestsAndBenchmarksToExecutables super.chainweb))) "use_systemd";
+      cuckoo = dontBenchmark (dontCheck (self.callHackageDirect {
+        pkg = "cuckoo";
+        ver = "0.2.1";
+        sha256 = "1dsac9qc90aagcgvznzfjd4wl8wgxhq1m8f5h556ys72nkm1ablx";
+       } {}));
+      quickcheck-classes-base = dontCheck (self.callHackageDirect {
+        pkg = "quickcheck-classes-base";
+        ver = "0.6.0.0";
+        sha256 = "1mmhfp95wqg6i5gzap4b4g87zgbj46nnpir56hqah97igsbvis70";
+      } {});
     };
 
     packages = {