From e9d7c862febf6c4cbfc9d3ffa290de01db2d7f5c Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 19 Nov 2021 17:57:43 +0400 Subject: [PATCH] exit when Swarm.EnableRelayHop is set --- core/node/groups.go | 10 ++++++++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/core/node/groups.go b/core/node/groups.go index 930a2151bef..766290f249d 100644 --- a/core/node/groups.go +++ b/core/node/groups.go @@ -9,8 +9,8 @@ import ( blockstore "github.com/ipfs/go-ipfs-blockstore" config "github.com/ipfs/go-ipfs-config" util "github.com/ipfs/go-ipfs-util" - log "github.com/ipfs/go-log" - peer "github.com/libp2p/go-libp2p-core/peer" + "github.com/ipfs/go-log" + "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/ipfs/go-ipfs/core/node/libp2p" @@ -122,6 +122,12 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option { logger.Error("Use the `Swarm.Transports.Network.Relay' config field instead") } } + //nolint + if cfg.Swarm.EnableRelayHop { + logger.Fatal("The `Swarm.EnableRelayHop` config field is ignored.\n" + + "Use `Swarm.RelayService` to configure the circuit v2 relay.\n" + + "If you want to continue running a circuit v1 relay, please use the standalone relay daemon: https://github.com/libp2p/go-libp2p-relay-daemon (with RelayV1.Enabled: true)") + } // Gather all the options opts := fx.Options( diff --git a/go.mod b/go.mod index 739d85be399..6c28274de42 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/ipfs/go-ipfs-blockstore v0.1.6 github.com/ipfs/go-ipfs-chunker v0.0.5 github.com/ipfs/go-ipfs-cmds v0.6.0 - github.com/ipfs/go-ipfs-config v0.16.0 + github.com/ipfs/go-ipfs-config v0.17.1-0.20211119131814-b64b14eb7fdf github.com/ipfs/go-ipfs-exchange-interface v0.0.1 github.com/ipfs/go-ipfs-exchange-offline v0.0.1 github.com/ipfs/go-ipfs-files v0.0.9 diff --git a/go.sum b/go.sum index 643d4206182..711872edf95 100644 --- a/go.sum +++ b/go.sum @@ -465,8 +465,8 @@ github.com/ipfs/go-ipfs-chunker v0.0.5 h1:ojCf7HV/m+uS2vhUGWcogIIxiO5ubl5O57Q7Na github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod h1:jhgdF8vxRHycr00k13FM8Y0E+6BoalYeobXmUyTreP8= github.com/ipfs/go-ipfs-cmds v0.6.0 h1:yAxdowQZzoFKjcLI08sXVNnqVj3jnABbf9smrPQmBsw= github.com/ipfs/go-ipfs-cmds v0.6.0/go.mod h1:ZgYiWVnCk43ChwoH8hAmI1IRbuVtq3GSTHwtRB/Kqhk= -github.com/ipfs/go-ipfs-config v0.16.0 h1:CBtIYyp/iWIczCv83bmfge8EA2KqxOOfqmETs3tUnnU= -github.com/ipfs/go-ipfs-config v0.16.0/go.mod h1:wz2lKzOjgJeYJa6zx8W9VT7mz+iSd0laBMqS/9wmX6A= +github.com/ipfs/go-ipfs-config v0.17.1-0.20211119131814-b64b14eb7fdf h1:heQP2WBtZOwu6/0rcBNHS44eBoWLdu1ktFlCbgqkP1E= +github.com/ipfs/go-ipfs-config v0.17.1-0.20211119131814-b64b14eb7fdf/go.mod h1:wz2lKzOjgJeYJa6zx8W9VT7mz+iSd0laBMqS/9wmX6A= github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw= github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ= github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=