From fab924999323fd53253c0b6c06233a3bc2cc3458 Mon Sep 17 00:00:00 2001 From: Nicholas Clarke Date: Mon, 11 Oct 2021 13:31:51 +0200 Subject: [PATCH] Update: DomainAddress is now DomainAccessPoint. This change occurred in https://github.com/input-output-hk/ouroboros-network/commit/be571bece03d5a0f14be0acc7fda663c8b756f90 --- cardano-node/src/Cardano/Node/Types.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cardano-node/src/Cardano/Node/Types.hs b/cardano-node/src/Cardano/Node/Types.hs index ee5531031c3..9933fd26cfd 100644 --- a/cardano-node/src/Cardano/Node/Types.hs +++ b/cardano-node/src/Cardano/Node/Types.hs @@ -65,7 +65,7 @@ import qualified Cardano.Chain.Update as Byron import Cardano.Crypto (RequiresNetworkMagic (..)) import qualified Cardano.Crypto.Hash as Crypto import Cardano.Node.Protocol.Types (Protocol (..)) -import Ouroboros.Network.PeerSelection.RootPeersDNS (DomainAddress (..)) +import Ouroboros.Network.PeerSelection.RootPeersDNS (DomainAccessPoint (..)) --TODO: things will probably be clearer if we don't use these newtype wrappers and instead -- use records with named fields in the CLI code. @@ -139,9 +139,11 @@ nodeIPv4ToIPAddress = fmap nodeHostIPv4AddressToIPAddress nodeIPv6ToIPAddress :: NodeIPv6Address -> NodeIPAddress nodeIPv6ToIPAddress = fmap nodeHostIPv6AddressToIPAddress -nodeDnsAddressToDomainAddress :: NodeDnsAddress -> DomainAddress +-- TODO Consider renaming this function, since 'DomainAddress' has been renamed +-- 'DomainAccessPoint'. +nodeDnsAddressToDomainAddress :: NodeDnsAddress -> DomainAccessPoint nodeDnsAddressToDomainAddress NodeAddress { naHostAddress = NodeHostDnsAddress dns, naPort } - = DomainAddress (Text.encodeUtf8 dns) naPort + = DomainAccessPoint (Text.encodeUtf8 dns) naPort nodeAddressToSockAddr :: NodeIPAddress -> SockAddr nodeAddressToSockAddr (NodeAddress addr port) =