Address review

node/builder.go

@@ -15,7 +15,7 @@ import (
 	"github.com/filecoin-project/go-lotus/build"
 	"github.com/filecoin-project/go-lotus/node/modules"
 	"github.com/filecoin-project/go-lotus/node/modules/helpers"
-	"github.com/filecoin-project/go-lotus/node/modules/libp2p"
+	"github.com/filecoin-project/go-lotus/node/modules/lp2p"
 )
 
 var defaultListenAddrs = []string{ // TODO: better defaults?
@@ -41,28 +41,28 @@ func New(ctx context.Context) (api.API, error) {
 			fx.Provide(
 				pstoremem.NewPeerstore,
 
-				libp2p.DefaultTransports,
-				libp2p.PNet,
-				libp2p.Host,
-				libp2p.RoutedHost,
-				libp2p.DHTRouting(false),
+				lp2p.DefaultTransports,
+				lp2p.PNet,
+				lp2p.Host,
+				lp2p.RoutedHost,
+				lp2p.DHTRouting(false),
 
-				libp2p.DiscoveryHandler,
-				libp2p.AddrsFactory(nil, nil),
-				libp2p.SmuxTransport(true),
-				libp2p.Relay(true, false),
-				libp2p.Security(true, false),
+				lp2p.DiscoveryHandler,
+				lp2p.AddrsFactory(nil, nil),
+				lp2p.SmuxTransport(true),
+				lp2p.Relay(true, false),
+				lp2p.Security(true, false),
 
-				libp2p.BaseRouting,
-				libp2p.Routing,
+				lp2p.BaseRouting,
+				lp2p.Routing,
 
-				libp2p.NatPortMap,
-				libp2p.ConnectionManager(50, 200, 20*time.Second),
+				lp2p.NatPortMap,
+				lp2p.ConnectionManager(50, 200, 20*time.Second),
 			),
 
 			fx.Invoke(
-				libp2p.PstoreAddSelfKeys,
-				libp2p.StartListening(defaultListenAddrs),
+				lp2p.PstoreAddSelfKeys,
+				lp2p.StartListening(defaultListenAddrs),
 			),
 		),
 

node/modules/lp2p/addrs.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"fmt"

node/modules/lp2p/discovery.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"context"

node/modules/lp2p/host.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"context"

node/modules/lp2p/libp2p.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"time"

node/modules/lp2p/nat.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"github.com/libp2p/go-libp2p"

node/modules/lp2p/pnet.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"fmt"

node/modules/lp2p/pubsub.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	host "github.com/libp2p/go-libp2p-core/host"

node/modules/lp2p/relay.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"fmt"

node/modules/lp2p/routing.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"context"

node/modules/lp2p/smux.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"os"
@@ -36,7 +36,7 @@ func makeSmuxTransportOption(mplexExp bool) libp2p.Option {
 	for _, id := range order {
 		tpt, ok := muxers[id]
 		if !ok {
-			log.Warning("unknown or duplicate muxer in LIBP2P_MUX_PREFS: %s", id)
+			log.Warningf("unknown or duplicate muxer in LIBP2P_MUX_PREFS: %s", id)
 			continue
 		}
 		delete(muxers, id)

node/modules/lp2p/transport.go

@@ -1,4 +1,4 @@
-package libp2p
+package lp2p
 
 import (
 	"github.com/libp2p/go-libp2p"