From 5e914196457f36ed6ea07d361a95f58486d5537c Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Tue, 7 Jan 2025 11:48:56 +0100 Subject: [PATCH] ouroboros-network-api: renamed Ouroboros.Network.PeerSelection.PeerSharing.Codec module The `Ouroboros.Network.RemoteAddress.Codec` seems like a better place for it, since its not only `peer-sharing` related. --- ouroboros-network-api/ouroboros-network-api.cabal | 2 +- ouroboros-network-api/src/Ouroboros/Network/PublicState.hs | 2 +- .../{PeerSelection/PeerSharing => RemoteAddress}/Codec.hs | 2 +- ouroboros-network-protocols/cddl/Main.hs | 4 ++-- .../Ouroboros/Network/Protocol/PeerSharing/Codec/CDDL.hs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename ouroboros-network-api/src/Ouroboros/Network/{PeerSelection/PeerSharing => RemoteAddress}/Codec.hs (98%) diff --git a/ouroboros-network-api/ouroboros-network-api.cabal b/ouroboros-network-api/ouroboros-network-api.cabal index 8858f565ccc..3ba968ca740 100644 --- a/ouroboros-network-api/ouroboros-network-api.cabal +++ b/ouroboros-network-api/ouroboros-network-api.cabal @@ -45,12 +45,12 @@ library Ouroboros.Network.PeerSelection.PeerAdvertise Ouroboros.Network.PeerSelection.PeerMetric.Type Ouroboros.Network.PeerSelection.PeerSharing - Ouroboros.Network.PeerSelection.PeerSharing.Codec Ouroboros.Network.PeerSelection.PeerTrustable Ouroboros.Network.PeerSelection.RelayAccessPoint Ouroboros.Network.Point Ouroboros.Network.Protocol.Limits Ouroboros.Network.PublicState + Ouroboros.Network.RemoteAddress.Codec Ouroboros.Network.SizeInBytes Ouroboros.Network.Util.ShowProxy diff --git a/ouroboros-network-api/src/Ouroboros/Network/PublicState.hs b/ouroboros-network-api/src/Ouroboros/Network/PublicState.hs index 0c9ef4e6998..4f4372237c9 100644 --- a/ouroboros-network-api/src/Ouroboros/Network/PublicState.hs +++ b/ouroboros-network-api/src/Ouroboros/Network/PublicState.hs @@ -36,7 +36,7 @@ import GHC.Generics import Ouroboros.Network.ConnectionId import Ouroboros.Network.ConnectionManager.Public -import Ouroboros.Network.PeerSelection.PeerSharing.Codec (RemoteAddressEncoding (..)) +import Ouroboros.Network.RemoteAddress.Codec (RemoteAddressEncoding (..)) data ConnectionManagerState peeraddr = ConnectionManagerState { diff --git a/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerSharing/Codec.hs b/ouroboros-network-api/src/Ouroboros/Network/RemoteAddress/Codec.hs similarity index 98% rename from ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerSharing/Codec.hs rename to ouroboros-network-api/src/Ouroboros/Network/RemoteAddress/Codec.hs index 67c54e95d90..b041a56c56d 100644 --- a/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerSharing/Codec.hs +++ b/ouroboros-network-api/src/Ouroboros/Network/RemoteAddress/Codec.hs @@ -2,7 +2,7 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE LambdaCase #-} -module Ouroboros.Network.PeerSelection.PeerSharing.Codec +module Ouroboros.Network.RemoteAddress.Codec ( encodePortNumber , decodePortNumber , encodeRemoteAddress diff --git a/ouroboros-network-protocols/cddl/Main.hs b/ouroboros-network-protocols/cddl/Main.hs index dc00fcbfb26..18e47371fa5 100644 --- a/ouroboros-network-protocols/cddl/Main.hs +++ b/ouroboros-network-protocols/cddl/Main.hs @@ -115,8 +115,6 @@ import Ouroboros.Network.Protocol.PeerSharing.Type qualified as PeerSharing import Test.ChainGenerators () import Test.Data.CDDL (Any (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Codec (decodeRemoteAddress, - encodeRemoteAddress) import Ouroboros.Network.Protocol.BlockFetch.Codec.CDDL import Ouroboros.Network.Protocol.ChainSync.Codec.CDDL import Ouroboros.Network.Protocol.LocalStateQuery.Codec.CDDL @@ -124,6 +122,8 @@ import Ouroboros.Network.Protocol.LocalTxMonitor.Codec.CDDL import Ouroboros.Network.Protocol.LocalTxSubmission.Codec.CDDL import Ouroboros.Network.Protocol.PeerSharing.Codec.CDDL import Ouroboros.Network.Protocol.TxSubmission2.Codec.CDDL +import Ouroboros.Network.RemoteAddress.Codec (decodeRemoteAddress, + encodeRemoteAddress) import Test.QuickCheck hiding (Result (..)) import Test.QuickCheck.Instances.ByteString () import Test.Tasty (TestTree, adjustOption, defaultMain, testGroup) diff --git a/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/PeerSharing/Codec/CDDL.hs b/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/PeerSharing/Codec/CDDL.hs index 7892898088e..75e6b13deec 100644 --- a/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/PeerSharing/Codec/CDDL.hs +++ b/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/PeerSharing/Codec/CDDL.hs @@ -5,10 +5,10 @@ import Data.ByteString.Lazy qualified as BL import Network.Socket (SockAddr (..)) import Network.TypedProtocol.Codec import Ouroboros.Network.NodeToNode.Version -import Ouroboros.Network.PeerSelection.PeerSharing.Codec (decodeRemoteAddress, - encodeRemoteAddress) import Ouroboros.Network.Protocol.PeerSharing.Codec (codecPeerSharing) import Ouroboros.Network.Protocol.PeerSharing.Type +import Ouroboros.Network.RemoteAddress.Codec (decodeRemoteAddress, + encodeRemoteAddress) peerSharingCodec :: NodeToNodeVersion -> Codec (PeerSharing SockAddr)