dmq: integrate LedgerPeerSnapshot changes

Author: crocodile-dentist

dmq-node/src/DMQ/Configuration.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE DerivingVia                #-}
 {-# LANGUAGE FlexibleContexts           #-}
@@ -69,7 +70,7 @@ import Ouroboros.Network.OrphanInstances ()
 import Ouroboros.Network.PeerSelection.Governor.Types
            (PeerSelectionTargets (..), makePublicPeerSelectionStateVar)
 import Ouroboros.Network.PeerSelection.LedgerPeers.Type
-           (LedgerPeerSnapshot (..))
+           (LedgerPeerSnapshot (..), LedgerPeersKind (..))
 import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
 import Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..))
 import Ouroboros.Network.Snocket (LocalAddress (..), RemoteAddress)
@@ -569,8 +570,8 @@ mkDiffusionConfiguration
     updateLedgerPeerSnapshot :: HasCallStack
                              => FilePath
                              -> STM IO (Maybe FilePath)
-                             -> (Maybe LedgerPeerSnapshot -> STM IO ())
-                             -> IO (Maybe LedgerPeerSnapshot)
+                             -> (Maybe (LedgerPeerSnapshot BigLedgerPeers) -> STM IO ())
+                             -> IO (Maybe (LedgerPeerSnapshot BigLedgerPeers))
     updateLedgerPeerSnapshot topologyDir readLedgerPeerPath writeVar = do
       mPeerSnapshotFile <- atomically readLedgerPeerPath
       mLedgerPeerSnapshot <- case mPeerSnapshotFile of
@@ -604,5 +605,3 @@ data ConfigurationError =
 
 instance Exception ConfigurationError where
   displayException NoAddressInformation = "no ipv4 or ipv6 address specified, use --host-addr or --host-ipv6-addr"
-
-

dmq-node/src/DMQ/Configuration/Topology.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE DeriveGeneric     #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE NamedFieldPuns    #-}
@@ -16,7 +17,7 @@ import Data.Text qualified as Text
 import Ouroboros.Network.Diffusion.Topology (NetworkTopology (..))
 import Ouroboros.Network.OrphanInstances (localRootPeersGroupsFromJSON,
            networkTopologyFromJSON, networkTopologyToJSON)
-import Ouroboros.Network.PeerSelection.LedgerPeers.Type (LedgerPeerSnapshot)
+import Ouroboros.Network.PeerSelection.LedgerPeers.Type (LedgerPeerSnapshot, LedgerPeersKind (..))
 import System.Exit (die)
 
 data NoExtraConfig = NoExtraConfig
@@ -69,7 +70,7 @@ readTopologyFileOrError nc =
   >>= either (die . Text.unpack)
              pure
 
-readPeerSnapshotFile :: FilePath -> IO (Either Text LedgerPeerSnapshot)
+readPeerSnapshotFile :: FilePath -> IO (Either Text (LedgerPeerSnapshot BigLedgerPeers))
 readPeerSnapshotFile psf = do
   eBs <- try $ BS.readFile psf
   case eBs of
@@ -89,7 +90,7 @@ readPeerSnapshotFile psf = do
       , Text.pack err
       ]
 
-readPeerSnapshotFileOrError :: FilePath -> IO LedgerPeerSnapshot
+readPeerSnapshotFileOrError :: FilePath -> IO (LedgerPeerSnapshot BigLedgerPeers)
 readPeerSnapshotFileOrError psf =
       readPeerSnapshotFile psf
   >>= either (die . Text.unpack)