feat(config): change Addresses#AppendAnnounce to a []string

This is changed that way to avoid potential issues that a migration wouldn't catch, for example an automated deployment system.

Author: Jorropo

core/node/groups.go

@@ -129,7 +129,7 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option {
 		BaseLibP2P,
 
 		fx.Provide(libp2p.AddrFilters(cfg.Swarm.AddrFilters)),
-		fx.Provide(libp2p.AddrsFactory(cfg.Addresses.Announce, cfg.Addresses.AppendAnnouce, cfg.Addresses.NoAnnounce)),
+		fx.Provide(libp2p.AddrsFactory(cfg.Addresses.Announce, cfg.Addresses.AppendAnnounce, cfg.Addresses.NoAnnounce)),
 		fx.Provide(libp2p.SmuxTransport(cfg.Swarm.Transports)),
 		fx.Provide(libp2p.Relay(enableRelay, cfg.Swarm.EnableRelayHop)),
 		fx.Provide(libp2p.Transports(cfg.Swarm.Transports)),

core/node/libp2p/addrs.go

@@ -25,14 +25,23 @@ func AddrFilters(filters []string) func() (*ma.Filters, Libp2pOpts, error) {
 	}
 }
 
-func makeAddrsFactory(announce []string, appendAnnouce bool, noAnnounce []string) (p2pbhost.AddrsFactory, error) {
-	var annAddrs []ma.Multiaddr
-	for _, addr := range announce {
-		maddr, err := ma.NewMultiaddr(addr)
+func makeAddrsFactory(announce []string, appendAnnouce []string, noAnnounce []string) (p2pbhost.AddrsFactory, error) {
+	var err error // To assign to the slice in the for loop
+
+	annAddrs := make([]ma.Multiaddr, len(announce))
+	for i, addr := range announce {
+		annAddrs[i], err = ma.NewMultiaddr(addr)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	appendAnnAddrs := make([]ma.Multiaddr, len(appendAnnouce))
+	for i, addr := range appendAnnouce {
+		appendAnnAddrs[i], err = ma.NewMultiaddr(addr)
 		if err != nil {
 			return nil, err
 		}
-		annAddrs = append(annAddrs, maddr)
 	}
 
 	filters := ma.NewFilters()
@@ -52,14 +61,12 @@ func makeAddrsFactory(announce []string, appendAnnouce bool, noAnnounce []string
 
 	return func(allAddrs []ma.Multiaddr) []ma.Multiaddr {
 		var addrs []ma.Multiaddr
-		switch {
-		case appendAnnouce:
-			addrs = append(allAddrs, annAddrs...)
-		case len(annAddrs) > 0:
+		if len(annAddrs) > 0 {
 			addrs = annAddrs
-		default:
+		} else {
 			addrs = allAddrs
 		}
+		addrs = append(addrs, appendAnnAddrs...)
 
 		var out []ma.Multiaddr
 		for _, maddr := range addrs {
@@ -74,7 +81,7 @@ func makeAddrsFactory(announce []string, appendAnnouce bool, noAnnounce []string
 	}, nil
 }
 
-func AddrsFactory(announce []string, appendAnnouce bool, noAnnounce []string) func() (opts Libp2pOpts, err error) {
+func AddrsFactory(announce []string, appendAnnouce []string, noAnnounce []string) func() (opts Libp2pOpts, err error) {
 	return func() (opts Libp2pOpts, err error) {
 		addrsFactory, err := makeAddrsFactory(announce, appendAnnouce, noAnnounce)
 		if err != nil {

go.mod

@@ -109,4 +109,4 @@ require (
 
 go 1.15
 
-replace github.com/ipfs/go-ipfs-config => github.com/Jorropo/go-ipfs-config v0.14.1 // Temporary while waiting for https://github.com/ipfs/go-ipfs-config/pull/135/
+replace github.com/ipfs/go-ipfs-config => github.com/Jorropo/go-ipfs-config v0.14.2 // Temporary while waiting for https://github.com/ipfs/go-ipfs-config/pull/135/

go.sum

@@ -33,8 +33,8 @@ github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOv
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Jorropo/go-ipfs-config v0.14.1 h1:kpAlUUAiwLlm/wfOe1FRsUJepSytyMuFtlVViO83+xk=
-github.com/Jorropo/go-ipfs-config v0.14.1/go.mod h1:4IoXvJ4eEe+KpI/OXXeserUraTREewhTYJSRdhKgNcY=
+github.com/Jorropo/go-ipfs-config v0.14.2 h1:n89JXCYpgwLKjh8hle1UQCCuQwZmfaRtstqhQD605I0=
+github.com/Jorropo/go-ipfs-config v0.14.2/go.mod h1:4IoXvJ4eEe+KpI/OXXeserUraTREewhTYJSRdhKgNcY=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Kubuxu/go-os-helper v0.0.1 h1:EJiD2VUQyh5A9hWJLmc6iWg6yIcJ7jpBcwC8GMGXfDk=
 github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y=