Update CHaP and Fix build

IntersectMBO · Nov 27, 2024 · 3cdb9a3 · 3cdb9a3
1 parent 26f0a57
commit 3cdb9a3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 29 deletions.
diff --git a/cabal.project b/cabal.project
@@ -15,10 +15,10 @@ repository cardano-haskell-packages
 -- repeat the index-state for hackage to work around haskell.nix parsing limitation
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2024-10-24T05:58:23Z
+  , hackage.haskell.org 2024-11-27T13:28:14Z
 
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2024-09-26T15:16:07Z
+  , cardano-haskell-packages 2024-11-26T16:00:26Z
 
 packages: ./cardano-ping
           ./monoidal-synchronisation

diff --git a/flake.lock b/flake.lock
diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
@@ -58,10 +58,10 @@ library
     Cardano.Diffusion.Policies
     Cardano.Network.ArgumentsExtra
     Cardano.Network.LedgerPeerConsensusInterface
-    Cardano.Network.PeerSelection.Governor.Types
+    Cardano.Network.PeerSelection.Governor.Monitor
     Cardano.Network.PeerSelection.Governor.PeerSelectionActions
     Cardano.Network.PeerSelection.Governor.PeerSelectionState
-    Cardano.Network.PeerSelection.Governor.Monitor
+    Cardano.Network.PeerSelection.Governor.Types
     Cardano.Network.PeerSelection.PeerChurnArgs
     Cardano.Network.PeerSelection.Types
     Cardano.Network.PublicRootPeers
@@ -88,6 +88,8 @@ library
     Ouroboros.Network.NodeToNode
     Ouroboros.Network.PeerSelection.Churn
     Ouroboros.Network.PeerSelection.Governor
+    Ouroboros.Network.PeerSelection.Governor.Monitor
+    Ouroboros.Network.PeerSelection.Governor.Types
     Ouroboros.Network.PeerSelection.LedgerPeers
     Ouroboros.Network.PeerSelection.PeerMetric
     Ouroboros.Network.PeerSelection.PeerSelectionActions
@@ -107,8 +109,6 @@ library
     Ouroboros.Network.TxSubmission.Inbound
     Ouroboros.Network.TxSubmission.Mempool.Reader
     Ouroboros.Network.TxSubmission.Outbound
-    Ouroboros.Network.PeerSelection.Governor.Types
-    Ouroboros.Network.PeerSelection.Governor.Monitor
 
   other-modules:
     Ouroboros.Network.Diffusion.Utils
@@ -187,7 +187,7 @@ library
 
   if !os(windows)
     build-depends:
-      directory,
+      directory
 
   if flag(asserts)
     ghc-options: -fno-ignore-asserts

diff --git a/...ros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/PublicRootPeers.hs b/...ros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/PublicRootPeers.hs
@@ -1,6 +1,8 @@
-{-# OPTIONS_GHC -Wno-orphans #-}
+{-# LANGUAGE GADTs         #-}
 {-# LANGUAGE TypeOperators #-}
 
+{-# OPTIONS_GHC -Wno-orphans #-}
+
 module Test.Ouroboros.Network.PeerSelection.Cardano.PublicRootPeers
   ( arbitraryCardanoPublicRootPeers
   , tests

diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/MinimalP2P.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/MinimalP2P.hs
@@ -2,17 +2,14 @@
 {-# LANGUAGE DataKinds                #-}
 {-# LANGUAGE DisambiguateRecordFields #-}
 {-# LANGUAGE FlexibleContexts         #-}
+{-# LANGUAGE GADTs                    #-}
 {-# LANGUAGE KindSignatures           #-}
 {-# LANGUAGE NamedFieldPuns           #-}
 {-# LANGUAGE RankNTypes               #-}
 {-# LANGUAGE ScopedTypeVariables      #-}
 {-# LANGUAGE TypeApplications         #-}
 {-# LANGUAGE TypeOperators            #-}
 
-#if !defined(mingw32_HOST_OS)
-#define POSIX
-#endif
-
 -- | This module is expected to be imported qualified (it will clash
 -- with the "Ouroboros.Network.Diffusion.NonP2P").
 --
@@ -57,15 +54,19 @@ import Ouroboros.Network.Protocol.Handshake.Codec
 import Ouroboros.Network.Protocol.Handshake.Version
 import Ouroboros.Network.Socket (configureSocket, configureSystemdSocket)
 
+import Network.Mux qualified as Mx
 import Ouroboros.Network.ConnectionHandler
+import Ouroboros.Network.ConnectionManager.Core qualified as CM
 import Ouroboros.Network.ConnectionManager.InformationChannel
            (newInformationChannel)
 import Ouroboros.Network.ConnectionManager.Types
 import Ouroboros.Network.Diffusion.Common hiding (nullTracers)
 import Ouroboros.Network.Diffusion.Configuration
+import Ouroboros.Network.Diffusion.Policies (simplePeerSelectionPolicy)
 import Ouroboros.Network.Diffusion.Policies qualified as Diffusion.Policies
 import Ouroboros.Network.Diffusion.Utils
 import Ouroboros.Network.ExitPolicy
+import Ouroboros.Network.InboundGovernor qualified as IG
 import Ouroboros.Network.IOManager
 import Ouroboros.Network.Mux hiding (MiniProtocol (..))
 import Ouroboros.Network.MuxMode
@@ -86,24 +87,12 @@ import Ouroboros.Network.PeerSelection.PeerStateActions (PeerConnectionHandle,
 import Ouroboros.Network.PeerSelection.RootPeersDNS
 import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSActions
            (DNSLookupType (..), ioDNSActions)
+import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSSemaphore
+           (newLedgerAndPublicRootDNSSemaphore)
 import Ouroboros.Network.PeerSelection.State.LocalRootPeers qualified as LocalRootPeers
 import Ouroboros.Network.PeerSharing (PeerSharingRegistry (..))
 import Ouroboros.Network.RethrowPolicy
 import Ouroboros.Network.Server2 qualified as Server
-#ifdef POSIX
-#endif
-#ifdef POSIX
-import Network.Mux qualified as Mx
-import Ouroboros.Network.ConnectionManager.Core qualified as CM
-import Ouroboros.Network.Diffusion.Policies (simplePeerSelectionPolicy)
-import Ouroboros.Network.InboundGovernor qualified as IG
-import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSSemaphore
-           (newLedgerAndPublicRootDNSSemaphore)
-#else
-import Ouroboros.Network.PeerSelection.LedgerPeers.Type (LedgerPeerSnapshot,
-           MinBigLedgerPeersForTrustedState, UseLedgerPeers)
-import Ouroboros.Network.PeerSelection.PeerMetric (PeerMetrics)
-#endif
 
 runM
     :: forall m ntnFd ntnAddr ntnVersion ntnVersionData

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PublicRootPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PublicRootPeers.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE DerivingVia    #-}
+{-# LANGUAGE GADTs          #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE TypeOperators  #-}