Move cfg out to groups
License: MIT Signed-off-by: Michael Avila <davidmichaelavila@gmail.com>
Michael Avila committed
May 6, 2019 at 11:06 UTC
e8c9207da322d3e09aef51c10c27d5a3603e7936
2 files changed
+14
-12
core/node/core.go
+13
-11
@@ -4,7 +4,6 @@ import (
4
"context"
5
"fmt"
6
7
- "github.com/ipfs/go-ipfs-config"
7
"github.com/ipfs/go-ipfs/core/node/helpers"
8
"github.com/ipfs/go-ipfs/pin"
9
"github.com/ipfs/go-ipfs/repo"
@@ -60,16 +59,19 @@ func Dag(bs blockservice.BlockService) format.DAGService {
59
}
60
61
// OnlineExchange creates new LibP2P backed block exchange (BitSwap)
63
-func OnlineExchange(mctx helpers.MetricsCtx, lc fx.Lifecycle, cfg *config.Config, host host.Host, rt routing.IpfsRouting, bs blockstore.GCBlockstore) exchange.Interface {
64
- bitswapNetwork := network.NewFromIpfsHost(host, rt)
65
- bitswap.ProvideEnabled = !cfg.Experimental.StrategicProviding
66
- exch := bitswap.New(helpers.LifecycleCtx(mctx, lc), bitswapNetwork, bs)
67
- lc.Append(fx.Hook{
68
- OnStop: func(ctx context.Context) error {
69
- return exch.Close()
70
- },
71
- })
72
- return exch
62
+func OnlineExchange(provide bool) interface{} {
63
+ return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, rt routing.IpfsRouting, bs blockstore.GCBlockstore) exchange.Interface {
64
+ bitswapNetwork := network.NewFromIpfsHost(host, rt)
65
+ bitswap.ProvideEnabled = provide
66
+ exch := bitswap.New(helpers.LifecycleCtx(mctx, lc), bitswapNetwork, bs)
67
+ lc.Append(fx.Hook{
68
+ OnStop: func(ctx context.Context) error {
69
+ return exch.Close()
70
+ },
71
+ })
72
+ return exch
73
+
74
+ }
75
}
76
77
// Files loads persisted MFS root
core/node/groups.go
+1
-1
@@ -224,7 +224,7 @@ func Online(bcfg *BuildCfg, cfg *config.Config) fx.Option {
224
}
225
226
return fx.Options(
227
- fx.Provide(OnlineExchange),
227
+ fx.Provide(OnlineExchange(!cfg.Experimental.StrategicProviding)),
228
fx.Provide(Namesys(ipnsCacheSize)),
229
230
fx.Invoke(IpnsRepublisher(repubPeriod, recordLifetime)),