Use io-classes-1.2 and strict-checked-vars-0.1.0.1

IntersectMBO · Aug 2, 2023 · 1cd3318 · 1cd3318
1 parent 51e0c80
commit 1cd3318
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 37 deletions.
diff --git a/.github/workflows/cabal.project.local b/.github/workflows/cabal.project.local
@@ -4,8 +4,9 @@ ignore-project: False
 tests: True
 benchmarks: True
 
-package strict-stm
-  flags: +checktvarinvariant
+-- TODO: we only verify it with nix
+-- package strict-checked-vars
+--   flags: +checktvarinvariants +checkmvarinvariants
 
 program-options
   ghc-options: -Werror
@@ -21,9 +22,6 @@ package io-sim
   ghc-options: -Werror
   flags: +asserts
 
-package io-classes
-  flags: +checktvarinvariant
-
 package typed-protocols
   ghc-options: -Werror
 

diff --git a/cabal.project b/cabal.project
@@ -16,9 +16,9 @@ repository cardano-haskell-packages
 index-state: 2023-03-29T00:00:00Z
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2023-05-29T09:27:07Z
+  , hackage.haskell.org 2023-07-28T17:40:00Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2023-05-16T03:39:10Z
+  , cardano-haskell-packages 2023-08-02T10:58:44Z
 
 packages: ./cardano-ping
           ./monoidal-synchronisation

diff --git a/cardano-client/cardano-client.cabal b/cardano-client/cardano-client.cabal
@@ -21,7 +21,7 @@ library
   build-depends:       base              >=4.14 && <4.19,
                        bytestring        >=0.10 && <0.12,
                        containers,
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        ouroboros-network-api,
                        ouroboros-network,
                        ouroboros-network-framework,

diff --git a/cardano-ping/cardano-ping.cabal b/cardano-ping/cardano-ping.cabal
@@ -29,7 +29,7 @@ library
                         contra-tracer                 >=0.1      && <0.2,
                         time,
 
-                        si-timers                    ^>=1.1,
+                        si-timers                    ^>=1.2,
                         strict-stm,
 
                         network-mux                  ^>=0.4,

diff --git a/default.nix b/default.nix
@@ -39,18 +39,13 @@ let
 
     checks = recurseIntoAttrs {
       # `checks.tests` collect results of executing the tests:
-      tests = collectChecks' haskellPackages;
+      tests = collectChecks' haskellPackagesWithTVarCheck;
       styles = recurseIntoAttrs {
         check-nixfmt = callPackage ./nix/check-nixfmt.nix { };
         check-stylish = callPackage ./nix/check-stylish.nix { };
       };
     };
 
-    nightly-checks.tvar-invariant-checks = recurseIntoAttrs {
-      inherit haskellPackagesWithTVarCheck;
-      tests = collectChecks' haskellPackagesWithTVarCheck;
-    };
-
     shell = import ./shell.nix {
       inherit pkgs;
       withHoogle = true;

diff --git a/network-mux/network-mux.cabal b/network-mux/network-mux.cabal
@@ -46,7 +46,7 @@ common demo-deps
 
 library
   build-depends:       base            >=4.14 && <4.19,
-                       io-classes     ^>=1.1,
+                       io-classes     ^>=1.2,
                        strict-stm,
                        si-timers,
                        contra-tracer   >=0.1 && <0.2,

diff --git a/nix/ouroboros-network.nix b/nix/ouroboros-network.nix
@@ -6,7 +6,7 @@
 , profiling ? config.haskellNix.profiling or false
 , libsodium-vrf ? pkgs.libsodium-vrf, secp256k1 ? pkgs.secp256k1
   # Enable strict TVar invariant check flag in strict-stm
-, checkTVarInvariant ? false }:
+, checkTVarInvariants ? false }:
 let
   compiler-nix-name = pkgs.localConfig.ghcVersion;
   src = haskell-nix.haskellLib.cleanGit {
@@ -50,8 +50,8 @@ let
           });
         }
         {
-          packages.strict-stm.components.library.configureFlags = lib.mkForce
-            (if checkTVarInvariant then [ "-f checktvarinvariant" ] else [ ]);
+          packages.strict-checked-vars.components.library.configureFlags = lib.mkForce
+            (if checkTVarInvariants then [ "-f +checktvarinvariants" ] else [ ]);
         }
         ({ pkgs, ... }: {
           # Apply profiling arg to all library components in the build:

diff --git a/nix/pkgs.nix b/nix/pkgs.nix
@@ -17,7 +17,7 @@ in {
   ouroborosNetworkHaskellPackagesWithTVarCheck =
     import ./ouroboros-network.nix {
       inherit config pkgs lib stdenv haskell-nix buildPackages;
-      checkTVarInvariant = true;
+      checkTVarInvariants = true;
       inherit (sources) CHaP;
     };
 

diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/cardano-haskell-packages/",
         "owner": "input-output-hk",
         "repo": "cardano-haskell-packages",
-        "rev": "91f934baa24dcef5e2bd61bfdc9aad3d0a7437b8",
-        "sha256": "16d9bd0sdjiwyc8201z978x8avrif0k9vfak3l63r2i2bdv13dxs",
+        "rev": "0ced21474b5c8a4ce8320c1f61d5b9fcef3e3029",
+        "sha256": "18lnwi82z987y14n47rnnq2a0cchnx2iwkc2n7axfxgyidpid9fa",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-haskell-packages/archive/91f934baa24dcef5e2bd61bfdc9aad3d0a7437b8.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-haskell-packages/archive/0ced21474b5c8a4ce8320c1f61d5b9fcef3e3029.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "hackage.nix": {
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "1cf7e1a3746cc285aeebb0f87fbed10e23aa6b70",
-        "sha256": "1ph3jvz0n6g2c8p01nlm2vh6m5pqhpil03my1xjxm10rsckipbh3",
+        "rev": "4e6c3592ff197354762f3272515245ca862608ca",
+        "sha256": "1n3305hvl65yh2cizp5k6n620nk57nabdki3l67g4x1f2imjf5hb",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/hackage.nix/archive/1cf7e1a3746cc285aeebb0f87fbed10e23aa6b70.tar.gz",
+        "url": "https://github.com/input-output-hk/hackage.nix/archive/4e6c3592ff197354762f3272515245ca862608ca.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": "b3c99d7f13df89a9a918c835ecb7114098912962"
     },

diff --git a/ouroboros-network-api/ouroboros-network-api.cabal b/ouroboros-network-api/ouroboros-network-api.cabal
@@ -65,11 +65,11 @@ library
                        cardano-strict-containers,
                        contra-tracer,
 
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        network-mux      ^>=0.4,
                        strict-stm,
                        si-timers,
-                       typed-protocols  ^>=0.1.0.4,
+                       typed-protocols  ^>=0.1.0.6,
 
   ghc-options:         -Wall
                        -Wno-unticked-promoted-constructors

diff --git a/ouroboros-network-framework/ouroboros-network-framework.cabal b/ouroboros-network-framework/ouroboros-network-framework.cabal
@@ -86,7 +86,7 @@ library
                      , cardano-prelude
                      , contra-tracer
 
-                     , io-classes     ^>=1.1
+                     , io-classes     ^>=1.2
                      , si-timers
                      , strict-stm
 

diff --git a/ouroboros-network-protocols/ouroboros-network-protocols.cabal b/ouroboros-network-protocols/ouroboros-network-protocols.cabal
@@ -97,7 +97,7 @@ library
                        bytestring        >=0.10 && <0.12,
                        cborg             >=0.2.1 && <0.3,
 
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        si-timers,
 
                        ouroboros-network-api

diff --git a/ouroboros-network-testing/ouroboros-network-testing.cabal b/ouroboros-network-testing/ouroboros-network-testing.cabal
@@ -62,7 +62,7 @@ library
                        containers,
                        contra-tracer,
                        deque            ^>=0.4,
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        io-sim,
                        psqueues          >=0.2.3 && <0.3,
                        si-timers,

diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
@@ -117,15 +117,16 @@ library
                        cardano-strict-containers,
                        contra-tracer,
                        monoidal-synchronisation,
+                       strict-checked-vars ^>= 0.1.0.1,
 
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        io-classes-mtl   ^>=0.1,
                        network-mux,
                        si-timers,
                        ouroboros-network-api       ^>=0.5,
                        ouroboros-network-framework ^>=0.7,
                        ouroboros-network-protocols ^>=0.5.1.0,
-                       strict-stm                  ^>=1.1.0.1,
+                       strict-stm,
                        typed-protocols   >=0.1.0.4 && <1.0,
   if !os(windows)
     build-depends:     directory,

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerMetric.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerMetric.hs
@@ -32,7 +32,8 @@ module Ouroboros.Network.PeerSelection.PeerMetric
   , newPeerMetric'
   ) where
 
-import           Control.Concurrent.Class.MonadSTM.Strict
+import           Control.Concurrent.Class.MonadSTM.Strict.TVar.Checked.Switch
+import           Control.Monad.Class.MonadSTM
 import           Control.DeepSeq (NFData (..))
 import           Control.Monad (when)
 import           Control.Monad.Class.MonadTime.SI

diff --git a/ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound.hs b/ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound.hs
@@ -29,7 +29,8 @@ import           NoThunks.Class (NoThunks (..), unsafeNoThunks)
 
 import           Cardano.Prelude (forceElemsToWHNF)
 
-import           Control.Concurrent.Class.MonadSTM.Strict
+import           Control.Concurrent.Class.MonadSTM.Strict.TVar.Checked.Switch
+import           Control.Monad.Class.MonadSTM
 import           Control.Exception (assert)
 import           Control.Monad (unless)
 import           Control.Monad.Class.MonadThrow

diff --git a/shell.nix b/shell.nix
@@ -2,10 +2,10 @@
 # It just takes the shell attribute from default.nix.
 { config ? { }, sourcesOverride ? { }, withHoogle ? false
 , pkgs ? import ./nix { inherit config sourcesOverride; }
-, checkTVarInvariant ? false }:
+, checkTVarInvariants ? false }:
 with pkgs;
 let
-  hsPkgs = if checkTVarInvariant then
+  hsPkgs = if checkTVarInvariants then
     ouroborosNetworkHaskellPackagesWithTVarCheck
   else
     ouroborosNetworkHaskellPackages;