exit when Swarm.EnableRelayHop is set

ipfs · Nov 20, 2021 · e9d7c86 · e9d7c86
1 parent 0c2f9d5
commit e9d7c86
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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=