refactor: use *OptionalInteger in config

Applies changes from
ipfs/go-ipfs-config@c46fe1b

Author: lidel

core/node/libp2p/nat.go

@@ -3,7 +3,7 @@ package libp2p
 import (
 	"time"
 
-	"github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs-config"
 	"github.com/libp2p/go-libp2p"
 )
 
@@ -13,14 +13,12 @@ func AutoNATService(throttle *config.AutoNATThrottleConfig) func() Libp2pOpts {
 	return func() (opts Libp2pOpts) {
 		opts.Opts = append(opts.Opts, libp2p.EnableNATService())
 		if throttle != nil {
-			global := throttle.GlobalLimit
-			peer := throttle.PeerLimit
-			interval := time.Duration(throttle.Interval)
-			if interval == 0 {
-				interval = time.Minute
-			}
 			opts.Opts = append(opts.Opts,
-				libp2p.AutoNATServiceRateLimit(global, peer, interval),
+				libp2p.AutoNATServiceRateLimit(
+					throttle.GlobalLimit,
+					throttle.PeerLimit,
+					throttle.Interval.WithDefault(time.Minute),
+				),
 			)
 		}
 		return opts

core/node/libp2p/relay.go

@@ -24,24 +24,22 @@ func RelayService(enable bool, relayOpts config.RelayService) func() (opts Libp2
 	return func() (opts Libp2pOpts, err error) {
 		if enable {
 			r := relay.DefaultResources()
-			if i := int64(relayOpts.Limit.Data.WithDefault(0)); i > 0 {
-				r.Limit.Data = i
-			}
-			/* TODO: swap when https://github.com/ipfs/go-ipfs-config/pull/148 lands
-			if i := int(relayOpts.Limit.Duration.WithDefault(0)); i > 0 { */
-			if i := int(relayOpts.Limit.Duration); i > 0 {
-				r.Limit.Duration = time.Duration(relayOpts.Limit.Duration)
+			if relayOpts.Limit != nil {
+				if i := int64(relayOpts.Limit.Data.WithDefault(0)); i > 0 {
+					r.Limit.Data = i
+				}
+				if i := int(relayOpts.Limit.Duration.WithDefault(0)); i > 0 {
+					r.Limit.Duration = time.Duration(i)
+				}
 			}
 			if i := int(relayOpts.MaxCircuits.WithDefault(0)); i > 0 {
 				r.MaxCircuits = i
 			}
 			if i := int(relayOpts.BufferSize.WithDefault(0)); i > 0 {
 				r.BufferSize = i
 			}
-			/* TODO: swap when https://github.com/ipfs/go-ipfs-config/pull/148 lands
-			if i := int(relayOpts.ReservationTTL.WithDefault(0)); i > 0 { */
-			if i := int(relayOpts.ReservationTTL); i > 0 {
-				r.ReservationTTL = time.Duration(relayOpts.ReservationTTL)
+			if i := int(relayOpts.ReservationTTL.WithDefault(0)); i > 0 {
+				r.ReservationTTL = time.Duration(i)
 			}
 			if i := int(relayOpts.MaxReservations.WithDefault(0)); i > 0 {
 				r.MaxReservations = i

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.1-0.20211026210306-0fb5b58a4e11
+	github.com/ipfs/go-ipfs-config v0.16.1-0.20211027175806-8e9dc6a34ccb
 	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

go.sum

@@ -463,8 +463,10 @@ 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.1-0.20211026210306-0fb5b58a4e11 h1:2dQQwVI/WAmmWBJc8SkEQsQOTw99vMFqcfMw0PnNbJ0=
-github.com/ipfs/go-ipfs-config v0.16.1-0.20211026210306-0fb5b58a4e11/go.mod h1:wz2lKzOjgJeYJa6zx8W9VT7mz+iSd0laBMqS/9wmX6A=
+github.com/ipfs/go-ipfs-config v0.16.1-0.20211027170342-c46fe1bdc3f6 h1:OZmM5FOD8OW7p7stULH3p4+TaOQ45lHTI4GXhfk2tus=
+github.com/ipfs/go-ipfs-config v0.16.1-0.20211027170342-c46fe1bdc3f6/go.mod h1:wz2lKzOjgJeYJa6zx8W9VT7mz+iSd0laBMqS/9wmX6A=
+github.com/ipfs/go-ipfs-config v0.16.1-0.20211027175806-8e9dc6a34ccb h1:mBnVO/t/X1qOLOI6qlnvisaTiZCV+Cc/3oM1ZMfMm0Q=
+github.com/ipfs/go-ipfs-config v0.16.1-0.20211027175806-8e9dc6a34ccb/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=