From 51c0c8c23bc1ae9f06e10487c516c48713945785 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Mon, 8 Jan 2024 21:53:40 +0100 Subject: [PATCH] Fix #2004: Do not pre-resolve node_multiaddress I cannot remember the reason this was done this way. It seems stupid now. Hopefully it was stupid. --- ipfsconn/ipfshttp/ipfshttp.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/ipfsconn/ipfshttp/ipfshttp.go b/ipfsconn/ipfshttp/ipfshttp.go index de254c82..fec982e2 100644 --- a/ipfsconn/ipfshttp/ipfshttp.go +++ b/ipfsconn/ipfshttp/ipfshttp.go @@ -27,7 +27,6 @@ import ( logging "github.com/ipfs/go-log/v2" rpc "github.com/libp2p/go-libp2p-gorpc" peer "github.com/libp2p/go-libp2p/core/peer" - madns "github.com/multiformats/go-multiaddr-dns" manet "github.com/multiformats/go-multiaddr/net" "github.com/multiformats/go-multicodec" multihash "github.com/multiformats/go-multihash" @@ -141,20 +140,7 @@ func NewConnector(cfg *Config) (*Connector, error) { return nil, err } - nodeMAddr := cfg.NodeAddr - // dns multiaddresses need to be resolved first - if madns.Matches(nodeMAddr) { - ctx, cancel := context.WithTimeout(context.Background(), DNSTimeout) - defer cancel() - resolvedAddrs, err := madns.Resolve(ctx, cfg.NodeAddr) - if err != nil { - logger.Error(err) - return nil, err - } - nodeMAddr = resolvedAddrs[0] - } - - nodeNetwork, nodeAddr, err := manet.DialArgs(nodeMAddr) + nodeNetwork, nodeAddr, err := manet.DialArgs(cfg.NodeAddr) if err != nil { return nil, err }