Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SRV implementation #5018

Open
wants to merge 31 commits into
base: main
Choose a base branch
from

Remove redundant import

0ae3f96
Select commit
Loading
Failed to load commit list.
Open

SRV implementation #5018

Remove redundant import
0ae3f96
Select commit
Loading
Failed to load commit list.
IOG Hydra / ci/hydra-build:x86_64-linux.required failed Feb 14, 2025 in 7s

Build dependency failed

1 failed steps

Details

Failed Steps

Step 5

Derivation

/nix/store/phciwb9dqq51qhp5r8wlxbygg6xns5sk-check-stylish-haskell-exe-stylish-haskell.drv

Log

unpacking source archive /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source
source root is vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source
diff -ru /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs ./ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs
--- /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs        1970-01-01 00:00:01.000000000 +0000
+++ ./ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs  2025-02-14 17:47:20.076526584 +0000
@@ -61,8 +61,8 @@
 import Data.Text (Text)
 import Data.Text qualified as Text
 import Data.Void (Void)
-import Network.DNS (Domain, TYPE)
 import GHC.Exception (Exception)
+import Network.DNS (Domain, TYPE)
 import System.Random (StdGen, split)
 
 import Ouroboros.Network.Protocol.Handshake (HandshakeArguments (..))
@@ -104,7 +104,8 @@
 import Ouroboros.Network.PeerSelection.PublicRootPeers (PublicRootPeers)
 import Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint)
 import Ouroboros.Network.PeerSelection.RootPeersDNS (PeerActionsDNS)
-import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSActions (DNSLookupType (..))
+import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSActions
+           (DNSLookupType (..))
 import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSSemaphore (DNSSemaphore)
 import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency,
            LocalRootConfig, WarmValency)
@@ -125,7 +126,8 @@
 import Test.Ouroboros.Network.Diffusion.Node.Kernel qualified as Node
 import Test.Ouroboros.Network.Diffusion.Node.MiniProtocols qualified as Node
 import Test.Ouroboros.Network.PeerSelection.RootPeersDNS (DNSLookupDelay,
-           DNSTimeout, MockDNSLookupResult, DomainAccessPoint (..), mockDNSActions)
+           DNSTimeout, DomainAccessPoint (..), MockDNSLookupResult,
+           mockDNSActions)
 
 
 data Interfaces extraAPI m = Interfaces
diff -ru /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs ./ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs
--- /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs  1970-01-01 00:00:01.000000000 +0000
+++ ./ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs    2025-02-14 17:47:20.654518034 +0000
@@ -151,7 +151,7 @@
 import Test.Ouroboros.Network.PeerSelection.Instances qualified as PeerSelection
 import Test.Ouroboros.Network.PeerSelection.LocalRootPeers ()
 import Test.Ouroboros.Network.PeerSelection.RootPeersDNS (DNSLookupDelay (..),
-           DNSTimeout (..), MockDNSMap, DomainAccessPoint (..), genDomainName)
+           DNSTimeout (..), DomainAccessPoint (..), MockDNSMap, genDomainName)
 import Test.Ouroboros.Network.PeerSelection.RootPeersDNS qualified as PeerSelection hiding
            (tests)
 import Test.Ouroboros.Network.Utils
diff -ru /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs ./ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs
--- /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs     1970-01-01 00:00:01.000000000 +0000
+++ ./ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs       2025-02-14 17:47:20.486520519 +0000
@@ -1624,9 +1624,9 @@
           verify Map.empty ttlMap recovered t evs
         _ -> verify toRecover ttlMap recovered time evs
 
-    extractDomainName (RelayAccessDomain d _) = d
+    extractDomainName (RelayAccessDomain d _)  = d
     extractDomainName (RelayAccessSRVDomain d) = d
-    extractDomainName _ = error "impossible!"
+    extractDomainName _                        = error "impossible!"
 
     getTTLs (_, _, it) = it
 
diff -ru /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs ./ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs
--- /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs    1970-01-01 00:00:01.000000000 +0000
+++ ./ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs      2025-02-14 17:47:19.777531006 +0000
@@ -31,16 +31,16 @@
 
 import Control.Applicative (Alternative)
 import Control.Monad (forever, replicateM_)
-import Data.ByteString.Char8 qualified as BSC
 import Data.Bifunctor (bimap)
 import Data.ByteString.Char8 (pack)
+import Data.ByteString.Char8 qualified as BSC
 import Data.Dynamic (Typeable, fromDynamic)
 import Data.Either (fromLeft, rights)
 import Data.Foldable as Foldable (foldl')
 import Data.Function (fix)
 import Data.Functor (void)
 import Data.IP (fromHostAddress, toSockAddr)
-import Data.List (intercalate, find)
+import Data.List (find, intercalate)
 import Data.List.NonEmpty (NonEmpty (..))
 import Data.List.NonEmpty qualified as NonEmpty
 import Data.Map.Strict (Map)
@@ -74,8 +74,8 @@
 import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
 import Ouroboros.Network.PeerSelection.LedgerPeers
 import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..))
-import Ouroboros.Network.PeerSelection.RootPeersDNS (PeerActionsDNS (..))
 import Ouroboros.Network.PeerSelection.RelayAccessPoint
+import Ouroboros.Network.PeerSelection.RootPeersDNS (PeerActionsDNS (..))
 import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSActions
 import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSSemaphore
 import Ouroboros.Network.PeerSelection.RootPeersDNS.LocalRootPeers
@@ -602,7 +602,7 @@
                          | (relay, _) <- Map.assocs publicRootPeers
                          , dap <- case relay of
                              RelayAccessAddress {} -> []
-                             x -> [x]]
+                             x                     -> [x]]
                          (mkStdGen dnsSeed)
 
 --
@@ -639,10 +639,10 @@
   where
     them (_t, Right dns) =
       case dns of
-        (DNSResult DNSLocalPeer _ _ _) -> True
+        (DNSResult DNSLocalPeer _ _ _)           -> True
         (DNSTraceLookupError DNSLocalPeer _ _ _) -> True
-        (DNSSRVFail DNSLocalPeer _) -> True
-        _otherwise -> False
+        (DNSSRVFail DNSLocalPeer _)              -> True
+        _otherwise                               -> False
     them _ = True
 
 selectLocalRootGroupsEvents :: [(Time, TestTraceEvent (TraceLocalRootPeers () SockAddr Failure))]
@@ -656,10 +656,10 @@
   where
     them (_t, Right dns) =
       case dns of
-        (DNSResult DNSPublicPeer _ _ _) -> True
+        (DNSResult DNSPublicPeer _ _ _)           -> True
         (DNSTraceLookupError DNSPublicPeer _ _ _) -> True
-        (DNSSRVFail DNSPublicPeer _) -> True
-        _otherwise -> False
+        (DNSSRVFail DNSPublicPeer _)              -> True
+        _otherwise                                -> False
     them _ = True
 
 selectDnsResultEvents :: [(Time, TestTraceEvent a)]
diff -ru /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs ./ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs
--- /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs   1970-01-01 00:00:01.000000000 +0000
+++ ./ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs     2025-02-14 17:47:18.421551065 +0000
@@ -1,4 +1,3 @@
-{-# LANGUAGE BangPatterns             #-}
 {-# LANGUAGE BlockArguments           #-}
 {-# LANGUAGE CPP                      #-}
 {-# LANGUAGE DisambiguateRecordFields #-}
diff -ru /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS/DNSActions.hs ./ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS/DNSActions.hs
--- /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS/DNSActions.hs        1970-01-01 00:00:01.000000000 +0000
+++ ./ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS/DNSActions.hs  2025-02-14 17:47:18.324552499 +0000
@@ -62,8 +62,8 @@
 import Network.DNS qualified as DNS
 import System.Random
 
-import Ouroboros.Network.PeerSelection.RelayAccessPoint
 import Ouroboros.Network.PeerSelection.LedgerPeers.Type (LedgerPeersKind)
+import Ouroboros.Network.PeerSelection.RelayAccessPoint
 
 -- | Bundled with DNS lookup trace for observability
 --
diff -ru /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/RelayAccessPoint.hs ./ouroboros-network-api/src/Ouroboros/Network/PeerSelection/RelayAccessPoint.hs
--- /nix/store/81yw10n8g63ihzj4bmb667q7xwky14b3-vp08lfd1p8aiqdgi5601x0l4p1f3cir3-source/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/RelayAccessPoint.hs   1970-01-01 00:00:01.000000000 +0000
+++ ./ouroboros-network-api/src/Ouroboros/Network/PeerSelection/RelayAccessPoint.hs     2025-02-14 17:47:14.668606581 +0000
@@ -16,7 +16,7 @@
 
 import Data.Aeson
 import Data.Aeson.Types
-import Data.ByteString.Char8 (unpack, snoc, unsnoc)
+import Data.ByteString.Char8 (snoc, unpack, unsnoc)
 import Data.IP qualified as IP
 import Data.Text qualified as Text
 import Data.Text.Encoding (decodeUtf8, encodeUtf8)
*** stylish-haskell-exe-stylish-haskell-0.14.6.0 found changes that need addressed first