refactor: HTTPRetrieval.Enabled as Flag

Author: lidel

config/http_retrieval.go

@@ -1,9 +1,15 @@
 package config
 
 // HTTPRetrieval is the configuration object for HTTP Retrieval settings.
+// Implicit defaults can be found in core/node/bitswap.go
 type HTTPRetrieval struct {
-	Enabled    bool             `json:",omitempty"`
+	Enabled    Flag             `json:",omitempty"`
 	NumWorkers *OptionalInteger `json:",omitempty"`
 	Allowlist  []string         `json:",omitempty"`
 	Denylist   []string         `json:",omitempty"`
 }
+
+const (
+	DefaultHTTPRetrievalEnabled    = false // opt-in for now, until we figure out https://github.com/ipfs/specs/issues/496
+	DefaultHTTPRetrievalNumWorkers = 16
+)

core/node/bitswap.go

@@ -78,18 +78,18 @@ type bitswapIn struct {
 // group.
 func Bitswap(provide bool) interface{} {
 	return func(in bitswapIn, lc fx.Lifecycle) (*bitswap.Bitswap, error) {
-		var ntwk network.BitSwapNetwork
-		bitswapNetwork := bsnet.NewFromIpfsHost(in.Host)
+		var bitswapNetworks network.BitSwapNetwork
+		bitswapLibp2p := bsnet.NewFromIpfsHost(in.Host)
 
-		if httpCfg := in.Cfg.HTTPRetrieval; httpCfg.Enabled {
-			htnet := httpnet.New(in.Host,
-				httpnet.WithHTTPWorkers(int(httpCfg.NumWorkers.WithDefault(16))),
+		if httpCfg := in.Cfg.HTTPRetrieval; httpCfg.Enabled.WithDefault(config.DefaultHTTPRetrievalEnabled) {
+			bitswapHTTP := httpnet.New(in.Host,
+				httpnet.WithHTTPWorkers(int(httpCfg.NumWorkers.WithDefault(config.DefaultHTTPRetrievalNumWorkers))),
 				httpnet.WithAllowlist(httpCfg.Allowlist),
 				httpnet.WithDenylist(httpCfg.Denylist),
 			)
-			ntwk = network.New(in.Host.Peerstore(), bitswapNetwork, htnet)
+			bitswapNetworks = network.New(in.Host.Peerstore(), bitswapLibp2p, bitswapHTTP)
 		} else {
-			ntwk = bitswapNetwork
+			bitswapNetworks = bitswapLibp2p
 		}
 
 		var provider routing.ContentDiscovery
@@ -98,7 +98,7 @@ func Bitswap(provide bool) interface{} {
 			if in.Cfg.Internal.Bitswap != nil {
 				maxProviders = int(in.Cfg.Internal.Bitswap.ProviderSearchMaxResults.WithDefault(DefaultMaxProviders))
 			}
-			pqm, err := rpqm.New(bitswapNetwork,
+			pqm, err := rpqm.New(bitswapLibp2p,
 				in.Rt,
 				rpqm.WithMaxProviders(maxProviders),
 				rpqm.WithIgnoreProviders(in.Cfg.Routing.IgnoreProviders...),
@@ -110,7 +110,7 @@ func Bitswap(provide bool) interface{} {
 			provider = pqm
 
 		}
-		bs := bitswap.New(helpers.LifecycleCtx(in.Mctx, lc), ntwk, provider, in.Bs, in.BitswapOpts...)
+		bs := bitswap.New(helpers.LifecycleCtx(in.Mctx, lc), bitswapNetworks, provider, in.Bs, in.BitswapOpts...)
 
 		lc.Append(fx.Hook{
 			OnStop: func(ctx context.Context) error {

core/node/libp2p/routingopt.go

@@ -33,7 +33,7 @@ func constructDefaultHTTPRouters(cfg *config.Config) ([]*routinghelpers.Parallel
 	var routers []*routinghelpers.ParallelRouter
 	// Append HTTP routers for additional speed
 	for _, endpoint := range config.DefaultHTTPRouters {
-		httpRouter, err := irouting.ConstructHTTPRouter(endpoint, cfg.Identity.PeerID, httpAddrsFromConfig(cfg.Addresses), cfg.Identity.PrivKey, cfg.HTTPRetrieval.Enabled)
+		httpRouter, err := irouting.ConstructHTTPRouter(endpoint, cfg.Identity.PeerID, httpAddrsFromConfig(cfg.Addresses), cfg.Identity.PrivKey, cfg.HTTPRetrieval.Enabled.WithDefault(config.DefaultHTTPRetrievalEnabled))
 		if err != nil {
 			return nil, err
 		}