Removed DuplicateRecordFields extension

coot · coot · commit 29c64ad14677 · 2025-10-01T12:22:46.000+02:00
We don't need to disambiguate record fields anymore.
diff --git a/cardano-diffusion/lib/Cardano/Network/PeerSelection/Churn.hs b/cardano-diffusion/lib/Cardano/Network/PeerSelection/Churn.hs
@@ -1,10 +1,9 @@
-{-# LANGUAGE BangPatterns          #-}
-{-# LANGUAGE CPP                   #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE LambdaCase            #-}
-{-# LANGUAGE NamedFieldPuns        #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE BangPatterns        #-}
+{-# LANGUAGE CPP                 #-}
+{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE LambdaCase          #-}
+{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 #if __GLASGOW_HASKELL__ < 904
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
diff --git a/cardano-diffusion/tests/lib/Test/Cardano/Network/PeerSelection/MockEnvironment.hs b/cardano-diffusion/tests/lib/Test/Cardano/Network/PeerSelection/MockEnvironment.hs
@@ -1,15 +1,13 @@
-{-# LANGUAGE BangPatterns          #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE LambdaCase            #-}
-{-# LANGUAGE NamedFieldPuns        #-}
-{-# LANGUAGE RecordWildCards       #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE BangPatterns        #-}
+{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE LambdaCase          #-}
+{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE RecordWildCards     #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 {-# OPTIONS_GHC -Wno-deferred-out-of-scope-variables #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
-{-# LANGUAGE TypeApplications      #-}
 
 -- TODO: MockEnvironment should be generalised so we can put it in
 -- `ouroboros-network` and test various extensions of `PeerSelection`.
diff --git a/dmq-node/src/DMQ/Diffusion/Applications.hs b/dmq-node/src/DMQ/Diffusion/Applications.hs
@@ -1,6 +1,5 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE NamedFieldPuns        #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE NamedFieldPuns   #-}
 
 module DMQ.Diffusion.Applications where
 
@@ -40,45 +39,45 @@ diffusionApplications
     dmqcNetworkMagic = I networkMagic
   }
   Diffusion.Configuration {
-    dcMode
-  , dcPeerSharing
+    Diffusion.dcMode
+  , Diffusion.dcPeerSharing
   }
   ntnLimitsAndTimeouts
   ntnApps
   ntcApps
   peerSelectionPolicy =
   Diffusion.Applications {
-    daApplicationInitiatorMode =
+    Diffusion.daApplicationInitiatorMode =
       combineVersions
         [ simpleSingletonVersions
             version
             (stdVersionDataNTN networkMagic dcMode dcPeerSharing)
             (NTN.initiatorProtocols ntnLimitsAndTimeouts ntnApps version)
         | version <- [minBound..maxBound]
         ]
-  , daApplicationInitiatorResponderMode =
+  , Diffusion.daApplicationInitiatorResponderMode =
       combineVersions
         [ simpleSingletonVersions
             version
             (stdVersionDataNTN networkMagic dcMode dcPeerSharing)
             (NTN.initiatorAndResponderProtocols ntnLimitsAndTimeouts ntnApps version)
         | version <- [minBound..maxBound]
         ]
-  , daLocalResponderApplication         =
+  , Diffusion.daLocalResponderApplication =
       combineVersions
         [ simpleSingletonVersions
             version
             (stdVersionDataNTC networkMagic)
             (NTC.responders ntcApps version)
         | version <- [minBound..maxBound]
         ]
-  , daRethrowPolicy                     =  muxErrorRethrowPolicy
-                                        <> ioErrorRethrowPolicy
-  , daReturnPolicy                      = const dmqRepromoteDelay
-  , daRepromoteErrorDelay               = dmqRepromoteDelay
-  , daLocalRethrowPolicy                = mempty
-  , daPeerSelectionPolicy               = peerSelectionPolicy
-  , daPeerSharingRegistry               = peerSharingRegistry
+  , Diffusion.daRethrowPolicy       =  muxErrorRethrowPolicy
+                                   <> ioErrorRethrowPolicy
+  , Diffusion.daReturnPolicy        = const dmqRepromoteDelay
+  , Diffusion.daRepromoteErrorDelay = dmqRepromoteDelay
+  , Diffusion.daLocalRethrowPolicy  = mempty
+  , Diffusion.daPeerSelectionPolicy = peerSelectionPolicy
+  , Diffusion.daPeerSharingRegistry = peerSharingRegistry
   }
 
 
diff --git a/ouroboros-network/framework/lib/Ouroboros/Network/InboundGovernor.hs b/ouroboros-network/framework/lib/Ouroboros/Network/InboundGovernor.hs
@@ -1,15 +1,14 @@
-{-# LANGUAGE BangPatterns          #-}
-{-# LANGUAGE BlockArguments        #-}
-{-# LANGUAGE DataKinds             #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE GADTs                 #-}
-{-# LANGUAGE KindSignatures        #-}
-{-# LANGUAGE LambdaCase            #-}
-{-# LANGUAGE NamedFieldPuns        #-}
-{-# LANGUAGE RankNTypes            #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
-{-# LANGUAGE TypeOperators         #-}
+{-# LANGUAGE BangPatterns        #-}
+{-# LANGUAGE BlockArguments      #-}
+{-# LANGUAGE DataKinds           #-}
+{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE GADTs               #-}
+{-# LANGUAGE KindSignatures      #-}
+{-# LANGUAGE LambdaCase          #-}
+{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE RankNTypes          #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeOperators       #-}
 
 -- 'runResponder' is using a redundant constraint.
 {-# OPTIONS_GHC -Wno-redundant-constraints #-}
diff --git a/ouroboros-network/lib/Ouroboros/Network/Diffusion.hs b/ouroboros-network/lib/Ouroboros/Network/Diffusion.hs
@@ -1,14 +1,13 @@
-{-# LANGUAGE BlockArguments        #-}
-{-# LANGUAGE CPP                   #-}
-{-# LANGUAGE DataKinds             #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE GADTs                 #-}
-{-# LANGUAGE KindSignatures        #-}
-{-# LANGUAGE NamedFieldPuns        #-}
-{-# LANGUAGE RankNTypes            #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
-{-# LANGUAGE TypeOperators         #-}
+{-# LANGUAGE BlockArguments      #-}
+{-# LANGUAGE CPP                 #-}
+{-# LANGUAGE DataKinds           #-}
+{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE GADTs               #-}
+{-# LANGUAGE KindSignatures      #-}
+{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE RankNTypes          #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeOperators       #-}
 
 -- | This module is expected to be imported qualified.
 --
@@ -384,17 +383,17 @@ runM Interfaces
               Server.snocket          = diNtcSnocket,
               Server.tracer           = dtLocalServerTracer,
               Server.connectionLimits = localConnectionLimits,
-              inboundGovernorArgs =
+              Server.inboundGovernorArgs =
                 IG.Arguments {
-                  tracer                = dtLocalInboundGovernorTracer,
-                  transitionTracer      = nullTracer,
-                  debugTracer           = nullTracer,
-                  connectionDataFlow    = ntcDataFlow,
-                  idleTimeout           = Nothing,
-                  withConnectionManager = localWithConnectionManager localInbInfoChannel,
-                  mkConnectionHandler   = mkLocalConnectionHandler,
-                  infoChannel           = localInbInfoChannel
-                  }
+                  IG.tracer                = dtLocalInboundGovernorTracer,
+                  IG.transitionTracer      = nullTracer,
+                  IG.debugTracer           = nullTracer,
+                  IG.connectionDataFlow    = ntcDataFlow,
+                  IG.idleTimeout           = Nothing,
+                  IG.withConnectionManager = localWithConnectionManager localInbInfoChannel,
+                  IG.mkConnectionHandler   = mkLocalConnectionHandler,
+                  IG.infoChannel           = localInbInfoChannel
+                }
               }
           (\inboundGovernorThread _ _ -> Async.wait inboundGovernorThread)
 
@@ -731,19 +730,19 @@ runM Interfaces
                Server.tracer       = dtServerTracer,
                Server.connectionLimits
                                    = dcAcceptedConnectionsLimit,
-               inboundGovernorArgs =
+               Server.inboundGovernorArgs =
                  IG.Arguments {
-                   tracer                = dtInboundGovernorTracer,
-                   transitionTracer      = dtInboundGovernorTransitionTracer,
-                   debugTracer           = nullTracer,
-                   connectionDataFlow    = daNtnDataFlow,
-                   idleTimeout           = Just dcProtocolIdleTimeout,
-                   withConnectionManager =
+                   IG.tracer                = dtInboundGovernorTracer,
+                   IG.transitionTracer      = dtInboundGovernorTransitionTracer,
+                   IG.debugTracer           = nullTracer,
+                   IG.connectionDataFlow    = daNtnDataFlow,
+                   IG.idleTimeout           = Just dcProtocolIdleTimeout,
+                   IG.withConnectionManager =
                      withConnectionManagerInitiatorAndResponderMode inboundInfoChannel,
-                   mkConnectionHandler   =
+                   IG.mkConnectionHandler   =
                        makeConnectionHandler' daApplicationInitiatorResponderMode
                      . MuxInitiatorResponderConnectionHandler daNtnDataFlow,
-                   infoChannel           = inboundInfoChannel
+                   IG.infoChannel           = inboundInfoChannel
                  }
              }
 
diff --git a/ouroboros-network/lib/Ouroboros/Network/Diffusion/Topology.hs b/ouroboros-network/lib/Ouroboros/Network/Diffusion/Topology.hs
@@ -1,5 +1,4 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE NamedFieldPuns        #-}
+{-# LANGUAGE NamedFieldPuns #-}
 
 module Ouroboros.Network.Diffusion.Topology where
 
diff --git a/ouroboros-network/lib/Ouroboros/Network/PeerSelection.hs b/ouroboros-network/lib/Ouroboros/Network/PeerSelection.hs
@@ -1,6 +1,3 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE ExplicitNamespaces    #-}
-
 module Ouroboros.Network.PeerSelection
   ( module Governor
   , module PeerSelection
diff --git a/ouroboros-network/lib/Ouroboros/Network/PeerSelection/Churn.hs b/ouroboros-network/lib/Ouroboros/Network/PeerSelection/Churn.hs
@@ -1,10 +1,9 @@
-{-# LANGUAGE BangPatterns          #-}
-{-# LANGUAGE CPP                   #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE LambdaCase            #-}
-{-# LANGUAGE NamedFieldPuns        #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE BangPatterns        #-}
+{-# LANGUAGE CPP                 #-}
+{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE LambdaCase          #-}
+{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 #if __GLASGOW_HASKELL__ < 904
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
diff --git a/ouroboros-network/lib/Ouroboros/Network/PeerSelection/Governor.hs b/ouroboros-network/lib/Ouroboros/Network/PeerSelection/Governor.hs
@@ -1,10 +1,9 @@
-{-# LANGUAGE BangPatterns          #-}
-{-# LANGUAGE CPP                   #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE LambdaCase            #-}
-{-# LANGUAGE NamedFieldPuns        #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE BangPatterns        #-}
+{-# LANGUAGE CPP                 #-}
+{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE LambdaCase          #-}
+{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 #if __GLASGOW_HASKELL__ < 904
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
diff --git a/ouroboros-network/lib/Ouroboros/Network/PeerSelection/LedgerPeers.hs b/ouroboros-network/lib/Ouroboros/Network/PeerSelection/LedgerPeers.hs
@@ -1,12 +1,11 @@
-{-# LANGUAGE BangPatterns          #-}
-{-# LANGUAGE CPP                   #-}
-{-# LANGUAGE DerivingStrategies    #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE GADTs                 #-}
-{-# LANGUAGE LambdaCase            #-}
-{-# LANGUAGE NamedFieldPuns        #-}
-{-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE BangPatterns        #-}
+{-# LANGUAGE CPP                 #-}
+{-# LANGUAGE DerivingStrategies  #-}
+{-# LANGUAGE GADTs               #-}
+{-# LANGUAGE LambdaCase          #-}
+{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 #if __GLASGOW_HASKELL__ >= 908
 {-# OPTIONS_GHC -Wno-x-partial #-}
 #endif
