constructor: drop P2P prefix from libp2p related units
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Apr 23, 2019 at 12:41 UTC
456084e6133c84b60f1ce5a2eae115fa7abd2771
4 files changed
+42
-42
core/node/groups.go
+19
-19
@@ -14,23 +14,23 @@ import (
14
)
15
16
var BaseLibP2P = fx.Options(
17
- fx.Provide(libp2p.P2PAddrFilters),
18
- fx.Provide(libp2p.P2PBandwidthCounter),
19
- fx.Provide(libp2p.P2PPNet),
20
- fx.Provide(libp2p.P2PAddrsFactory),
21
- fx.Provide(libp2p.P2PConnectionManager),
22
- fx.Provide(libp2p.P2PNatPortMap),
23
- fx.Provide(libp2p.P2PRelay),
24
- fx.Provide(libp2p.P2PAutoRealy),
25
- fx.Provide(libp2p.P2PDefaultTransports),
26
- fx.Provide(libp2p.P2PQUIC),
17
+ fx.Provide(libp2p.AddrFilters),
18
+ fx.Provide(libp2p.BandwidthCounter),
19
+ fx.Provide(libp2p.PNet),
20
+ fx.Provide(libp2p.AddrsFactory),
21
+ fx.Provide(libp2p.ConnectionManager),
22
+ fx.Provide(libp2p.NatPortMap),
23
+ fx.Provide(libp2p.Relay),
24
+ fx.Provide(libp2p.AutoRealy),
25
+ fx.Provide(libp2p.DefaultTransports),
26
+ fx.Provide(libp2p.QUIC),
27
28
- fx.Provide(libp2p.P2PHost),
28
+ fx.Provide(libp2p.Host),
29
30
- fx.Provide(libp2p.NewDiscoveryHandler),
30
+ fx.Provide(libp2p.DiscoveryHandler),
31
32
fx.Invoke(libp2p.AutoNATService),
33
- fx.Invoke(libp2p.P2PPNetChecker),
33
+ fx.Invoke(libp2p.PNetChecker),
34
fx.Invoke(libp2p.StartListening),
35
fx.Invoke(libp2p.SetupDiscovery),
36
)
@@ -39,13 +39,13 @@ func LibP2P(cfg *BuildCfg) fx.Option {
39
opts := fx.Options(
40
BaseLibP2P,
41
42
- fx.Provide(libp2p.P2PSecurity(!cfg.DisableEncryptedConnections)),
42
+ fx.Provide(libp2p.Security(!cfg.DisableEncryptedConnections)),
43
maybeProvide(libp2p.Pubsub, cfg.getOpt("pubsub") || cfg.getOpt("ipnsps")),
44
45
- fx.Provide(libp2p.P2PSmuxTransport(cfg.getOpt("mplex"))),
46
- fx.Provide(libp2p.P2PRouting),
47
- fx.Provide(libp2p.P2PBaseRouting),
48
- maybeProvide(libp2p.P2PPubsubRouter, cfg.getOpt("ipnsps")),
45
+ fx.Provide(libp2p.SmuxTransport(cfg.getOpt("mplex"))),
46
+ fx.Provide(libp2p.Routing),
47
+ fx.Provide(libp2p.BaseRouting),
48
+ maybeProvide(libp2p.PubsubRouter, cfg.getOpt("ipnsps")),
49
)
50
51
return opts
@@ -85,7 +85,7 @@ func Online(cfg *BuildCfg) fx.Option {
85
86
fx.Invoke(IpnsRepublisher),
87
88
- fx.Provide(p2p.NewP2P),
88
+ fx.Provide(p2p.New),
89
90
LibP2P(cfg),
91
Providers,
core/node/libp2p/discovery.go
+1
-1
@@ -28,7 +28,7 @@ func (dh *discoveryHandler) HandlePeerFound(p peerstore.PeerInfo) {
28
}
29
}
30
31
-func NewDiscoveryHandler(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host) *discoveryHandler {
31
+func DiscoveryHandler(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host) *discoveryHandler {
32
return &discoveryHandler{
33
ctx: helpers.LifecycleCtx(mctx, lc),
34
host: host,
core/node/libp2p/libp2p.go
+20
-20
@@ -102,7 +102,7 @@ func Peerstore(id peer.ID, sk crypto.PrivKey) (peerstore.Peerstore, error) {
102
return ps, nil
103
}
104
105
-func P2PAddrFilters(cfg *config.Config) (opts Libp2pOpts, err error) {
105
+func AddrFilters(cfg *config.Config) (opts Libp2pOpts, err error) {
106
for _, s := range cfg.Swarm.AddrFilters {
107
f, err := mamask.NewMask(s)
108
if err != nil {
@@ -113,7 +113,7 @@ func P2PAddrFilters(cfg *config.Config) (opts Libp2pOpts, err error) {
113
return opts, nil
114
}
115
116
-func P2PBandwidthCounter(cfg *config.Config) (opts Libp2pOpts, reporter metrics.Reporter) {
116
+func BandwidthCounter(cfg *config.Config) (opts Libp2pOpts, reporter metrics.Reporter) {
117
reporter = metrics.NewBandwidthCounter()
118
119
if !cfg.Swarm.DisableBandwidthMetrics {
@@ -130,7 +130,7 @@ type Libp2pOpts struct {
130
131
type PNetFingerprint []byte
132
133
-func P2PPNet(repo repo.Repo) (opts Libp2pOpts, fp PNetFingerprint, err error) {
133
+func PNet(repo repo.Repo) (opts Libp2pOpts, fp PNetFingerprint, err error) {
134
swarmkey, err := repo.SwarmKey()
135
if err != nil || swarmkey == nil {
136
return opts, nil, err
@@ -146,7 +146,7 @@ func P2PPNet(repo repo.Repo) (opts Libp2pOpts, fp PNetFingerprint, err error) {
146
return opts, fp, nil
147
}
148
149
-func P2PPNetChecker(repo repo.Repo, ph host.Host, lc fx.Lifecycle) error {
149
+func PNetChecker(repo repo.Repo, ph host.Host, lc fx.Lifecycle) error {
150
// TODO: better check?
151
swarmkey, err := repo.SwarmKey()
152
if err != nil || swarmkey == nil {
@@ -229,7 +229,7 @@ func makeAddrsFactory(cfg config.Addresses) (p2pbhost.AddrsFactory, error) {
229
}, nil
230
}
231
232
-func P2PAddrsFactory(cfg *config.Config) (opts Libp2pOpts, err error) {
232
+func AddrsFactory(cfg *config.Config) (opts Libp2pOpts, err error) {
233
addrsFactory, err := makeAddrsFactory(cfg.Addresses)
234
if err != nil {
235
return opts, err
@@ -238,7 +238,7 @@ func P2PAddrsFactory(cfg *config.Config) (opts Libp2pOpts, err error) {
238
return
239
}
240
241
-func P2PConnectionManager(cfg *config.Config) (opts Libp2pOpts, err error) {
241
+func ConnectionManager(cfg *config.Config) (opts Libp2pOpts, err error) {
242
grace := config.DefaultConnMgrGracePeriod
243
low := config.DefaultConnMgrHighWater
244
high := config.DefaultConnMgrHighWater
@@ -308,21 +308,21 @@ func makeSmuxTransportOption(mplexExp bool) libp2p.Option {
308
return libp2p.ChainOptions(opts...)
309
}
310
311
-func P2PSmuxTransport(mplex bool) func() (opts Libp2pOpts, err error) {
311
+func SmuxTransport(mplex bool) func() (opts Libp2pOpts, err error) {
312
return func() (opts Libp2pOpts, err error) {
313
opts.Opts = append(opts.Opts, makeSmuxTransportOption(mplex))
314
return
315
}
316
}
317
318
-func P2PNatPortMap(cfg *config.Config) (opts Libp2pOpts, err error) {
318
+func NatPortMap(cfg *config.Config) (opts Libp2pOpts, err error) {
319
if !cfg.Swarm.DisableNatPortMap {
320
opts.Opts = append(opts.Opts, libp2p.NATPortMap())
321
}
322
return
323
}
324
325
-func P2PRelay(cfg *config.Config) (opts Libp2pOpts, err error) {
325
+func Relay(cfg *config.Config) (opts Libp2pOpts, err error) {
326
if cfg.Swarm.DisableRelay {
327
// Enabled by default.
328
opts.Opts = append(opts.Opts, libp2p.DisableRelay())
@@ -336,7 +336,7 @@ func P2PRelay(cfg *config.Config) (opts Libp2pOpts, err error) {
336
return
337
}
338
339
-func P2PAutoRealy(cfg *config.Config) (opts Libp2pOpts, err error) {
339
+func AutoRealy(cfg *config.Config) (opts Libp2pOpts, err error) {
340
// enable autorelay
341
if cfg.Swarm.EnableAutoRelay {
342
opts.Opts = append(opts.Opts, libp2p.EnableAutoRelay())
@@ -344,19 +344,19 @@ func P2PAutoRealy(cfg *config.Config) (opts Libp2pOpts, err error) {
344
return
345
}
346
347
-func P2PDefaultTransports() (opts Libp2pOpts, err error) {
347
+func DefaultTransports() (opts Libp2pOpts, err error) {
348
opts.Opts = append(opts.Opts, libp2p.DefaultTransports)
349
return
350
}
351
352
-func P2PQUIC(cfg *config.Config) (opts Libp2pOpts, err error) {
352
+func QUIC(cfg *config.Config) (opts Libp2pOpts, err error) {
353
if cfg.Experimental.QUIC {
354
opts.Opts = append(opts.Opts, libp2p.Transport(libp2pquic.NewTransport))
355
}
356
return
357
}
358
359
-func P2PSecurity(enabled bool) interface{} {
359
+func Security(enabled bool) interface{} {
360
if !enabled {
361
return func() (opts Libp2pOpts) {
362
// TODO: shouldn't this be Errorf to guarantee visibility?
@@ -389,15 +389,15 @@ type P2PHostIn struct {
389
Opts [][]libp2p.Option `group:"libp2p"`
390
}
391
392
-type BaseRouting routing.IpfsRouting
392
+type BaseIpfsRouting routing.IpfsRouting
393
type P2PHostOut struct {
394
fx.Out
395
396
Host host.Host
397
- Routing BaseRouting
397
+ Routing BaseIpfsRouting
398
}
399
400
-func P2PHost(mctx helpers.MetricsCtx, lc fx.Lifecycle, params P2PHostIn) (out P2PHostOut, err error) {
400
+func Host(mctx helpers.MetricsCtx, lc fx.Lifecycle, params P2PHostIn) (out P2PHostOut, err error) {
401
opts := []libp2p.Option{libp2p.NoListenAddrs}
402
for _, o := range params.Opts {
403
opts = append(opts, o...)
@@ -448,7 +448,7 @@ type p2pRouterOut struct {
448
Router Router `group:"routers"`
449
}
450
451
-func P2PBaseRouting(lc fx.Lifecycle, in BaseRouting) (out p2pRouterOut, dr *dht.IpfsDHT) {
451
+func BaseRouting(lc fx.Lifecycle, in BaseIpfsRouting) (out p2pRouterOut, dr *dht.IpfsDHT) {
452
if dht, ok := in.(*dht.IpfsDHT); ok {
453
dr = dht
454
@@ -474,7 +474,7 @@ type p2pOnlineRoutingIn struct {
474
Validator record.Validator
475
}
476
477
-func P2PRouting(in p2pOnlineRoutingIn) routing.IpfsRouting {
477
+func Routing(in p2pOnlineRoutingIn) routing.IpfsRouting {
478
routers := in.Routers
479
480
sort.SliceStable(routers, func(i, j int) bool {
@@ -495,14 +495,14 @@ func P2PRouting(in p2pOnlineRoutingIn) routing.IpfsRouting {
495
type p2pPSRoutingIn struct {
496
fx.In
497
498
- BaseRouting BaseRouting
498
+ BaseRouting BaseIpfsRouting
499
Repo repo.Repo
500
Validator record.Validator
501
Host host.Host
502
PubSub *pubsub.PubSub `optional:"true"`
503
}
504
505
-func P2PPubsubRouter(mctx helpers.MetricsCtx, lc fx.Lifecycle, in p2pPSRoutingIn) (p2pRouterOut, *namesys.PubsubValueStore) {
505
+func PubsubRouter(mctx helpers.MetricsCtx, lc fx.Lifecycle, in p2pPSRoutingIn) (p2pRouterOut, *namesys.PubsubValueStore) {
506
psRouter := namesys.NewPubsubValueStore(
507
helpers.LifecycleCtx(mctx, lc),
508
in.Host,
p2p/p2p.go
+2
-2
@@ -20,8 +20,8 @@ type P2P struct {
20
peerstore pstore.Peerstore
21
}
22
23
-// NewP2P creates new P2P struct
24
-func NewP2P(identity peer.ID, peerHost p2phost.Host, peerstore pstore.Peerstore) *P2P {
23
+// New creates new P2P struct
24
+func New(identity peer.ID, peerHost p2phost.Host, peerstore pstore.Peerstore) *P2P {
25
return &P2P{
26
identity: identity,
27
peerHost: peerHost,