cerc-io/lotus
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge remote-tracking branch 'origin/master' into feat/f2-chain

Browse Source
This commit is contained in:
Łukasz Magiera
2019-07-08 12:47:19 +02:00
parent 83a09ce9f3 7cd869da7f
commit 67902da2eb
13 changed files with 362 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node/builder.go
+1 -1
View File
@@ -28,7 +28,7 @@ import (
// can't really be identified by the returned type
type special struct{ id int }
// nolint
//nolint:golint
var (
DefaultTransportsKey = special{0} // Libp2p option
PNetKey = special{1} // Option + multiret
node/modules/lp2p/libp2p.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
logging "github.com/ipfs/go-log"
"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p-connmgr"
connmgr "github.com/libp2p/go-libp2p-connmgr"
"github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/libp2p/go-libp2p-core/peerstore"