config: DialBlocklist -> Swarm.AddrFilters

This commit changes the DialBlocklist key to be under the key
Swarm.AddrFilters instead.

License: MIT
Signed-off-by: Juan Batiz-Benet <juan@benet.ai>

core/commands/swarm.go

@@ -378,7 +378,7 @@ Where the above is equivalent to the standard CIDR:
 
     192.168.0.0/16
 
-Filters default to those specified under the "DialBlocklist" config key.
+Filters default to those specified under the "Swarm.AddrFilters" config key.
 `,
 	},
 	Subcommands: map[string]*cmds.Command{

core/core.go

@@ -258,7 +258,7 @@ func (n *IpfsNode) startOnlineServices(ctx context.Context, routingOption Routin
 	// get undialable addrs from config
 	cfg := n.Repo.Config()
 	var addrfilter []*net.IPNet
-	for _, s := range cfg.DialBlocklist {
+	for _, s := range cfg.Swarm.AddrFilters {
 		f, err := mamask.NewMask(s)
 		if err != nil {
 			return fmt.Errorf("incorrectly formatter address filter in config: %s", s)

repo/config/config.go

@@ -26,7 +26,7 @@ type Config struct {
 	Tour             Tour                  // local node's tour position
 	Gateway          Gateway               // local node's gateway server options
 	SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled)
-	DialBlocklist    []string
+	Swarm            SwarmConfig
 	Log              Log
 }
 

repo/config/swarm.go

+package config
+
+type SwarmConfig struct {
+	AddrFilters []string
+}

test/sharness/t0141-addfilter.sh

@@ -72,7 +72,7 @@ test_expect_success "init without any filters" '
 '
 
 test_expect_success "adding addresses to the config to filter succeeds" '
-	ipfs config --json DialBlocklist "[\"$AF1\", \"$AF4\"]"
+	ipfs config --json Swarm.AddrFilters "[\"$AF1\", \"$AF4\"]"
 '
 
 test_launch_ipfs_daemon