migrate to go-libp2p-core.

ipfs · May 28, 2019 · 53761df · 53761df
1 parent a1ca6a6
commit 53761df
Show file tree

Hide file tree

Showing 31 changed files with 128 additions and 180 deletions.
diff --git a/bitswap.go b/bitswap.go
@@ -29,7 +29,7 @@ import (
 	metrics "github.com/ipfs/go-metrics-interface"
 	process "github.com/jbenet/goprocess"
 	procctx "github.com/jbenet/goprocess/context"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 var log = logging.Logger("bitswap")

diff --git a/decision/engine.go b/decision/engine.go
@@ -16,7 +16,7 @@ import (
 	logging "github.com/ipfs/go-log"
 	"github.com/ipfs/go-peertaskqueue"
 	"github.com/ipfs/go-peertaskqueue/peertask"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 // TODO consider taking responsibility for other types of requests. For

diff --git a/decision/engine_test.go b/decision/engine_test.go
@@ -15,7 +15,7 @@ import (
 	ds "github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 	testutil "github.com/libp2p/go-testutil"
 )
 

diff --git a/decision/ledger.go b/decision/ledger.go
@@ -7,7 +7,7 @@ import (
 	wl "github.com/ipfs/go-bitswap/wantlist"
 
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 func newLedger(p peer.ID) *ledger {

diff --git a/go.mod b/go.mod
@@ -1,7 +1,6 @@
 module github.com/ipfs/go-bitswap
 
 require (
-	github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c // indirect
 	github.com/cskr/pubsub v1.0.2
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/gogo/protobuf v1.2.1
@@ -22,31 +21,19 @@ require (
 	github.com/ipfs/go-metrics-interface v0.0.1
 	github.com/ipfs/go-peertaskqueue v0.0.4
 	github.com/jbenet/goprocess v0.1.3
-	github.com/libp2p/go-libp2p v0.0.30
-	github.com/libp2p/go-libp2p-host v0.0.3
-	github.com/libp2p/go-libp2p-interface-connmgr v0.0.5
-	github.com/libp2p/go-libp2p-loggables v0.0.1
-	github.com/libp2p/go-libp2p-net v0.0.2
-	github.com/libp2p/go-libp2p-netutil v0.0.1
-	github.com/libp2p/go-libp2p-peer v0.2.0
-	github.com/libp2p/go-libp2p-peerstore v0.1.0
-	github.com/libp2p/go-libp2p-protocol v0.1.0
-	github.com/libp2p/go-libp2p-routing v0.0.1
-	github.com/libp2p/go-libp2p-yamux v0.1.3 // indirect
-	github.com/libp2p/go-mplex v0.0.4 // indirect
-	github.com/libp2p/go-stream-muxer v0.1.0 // indirect
+	github.com/libp2p/go-libp2p v0.1.0
+	github.com/libp2p/go-libp2p-core v0.0.2
+	github.com/libp2p/go-libp2p-loggables v0.1.0
+	github.com/libp2p/go-libp2p-netutil v0.1.0
+	github.com/libp2p/go-libp2p-testing v0.0.3
 	github.com/libp2p/go-testutil v0.0.1
-	github.com/libp2p/go-yamux v1.2.3 // indirect
 	github.com/mattn/go-colorable v0.1.2 // indirect
-	github.com/minio/sha256-simd v0.1.0 // indirect
 	github.com/multiformats/go-multiaddr v0.0.4
-	github.com/multiformats/go-multistream v0.1.0 // indirect
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/onsi/gomega v1.5.0 // indirect
 	github.com/opentracing/opentracing-go v1.1.0 // indirect
-	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect
 	golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
 	golang.org/x/sys v0.0.0-20190524122548-abf6ff778158 // indirect
 	golang.org/x/text v0.3.2 // indirect
 	gopkg.in/yaml.v2 v2.2.2 // indirect
 )
+
+replace github.com/ipfs/go-ipfs-routing => ../go-ipfs-routing
diff --git a/go.sum b/go.sum
diff --git a/message/message.go b/message/message.go
@@ -10,7 +10,8 @@ import (
 
 	ggio "github.com/gogo/protobuf/io"
 	cid "github.com/ipfs/go-cid"
-	inet "github.com/libp2p/go-libp2p-net"
+
+	"github.com/libp2p/go-libp2p-core/network"
 )
 
 // BitSwapMessage is the basic interface for interacting building, encoding,
@@ -169,7 +170,7 @@ func (m *impl) AddBlock(b blocks.Block) {
 
 // FromNet generates a new BitswapMessage from incoming data on an io.Reader.
 func FromNet(r io.Reader) (BitSwapMessage, error) {
-	pbr := ggio.NewDelimitedReader(r, inet.MessageSizeMax)
+	pbr := ggio.NewDelimitedReader(r, network.MessageSizeMax)
 	return FromPBReader(pbr)
 }
 

diff --git a/messagequeue/messagequeue.go b/messagequeue/messagequeue.go
@@ -9,7 +9,7 @@ import (
 	bsnet "github.com/ipfs/go-bitswap/network"
 	wantlist "github.com/ipfs/go-bitswap/wantlist"
 	logging "github.com/ipfs/go-log"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 var log = logging.Logger("bitswap")

diff --git a/messagequeue/messagequeue_test.go b/messagequeue/messagequeue_test.go
@@ -9,7 +9,7 @@ import (
 
 	bsmsg "github.com/ipfs/go-bitswap/message"
 	bsnet "github.com/ipfs/go-bitswap/network"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 type fakeMessageNetwork struct {

diff --git a/network/interface.go b/network/interface.go
@@ -6,9 +6,10 @@ import (
 	bsmsg "github.com/ipfs/go-bitswap/message"
 
 	cid "github.com/ipfs/go-cid"
-	ifconnmgr "github.com/libp2p/go-libp2p-interface-connmgr"
-	peer "github.com/libp2p/go-libp2p-peer"
-	protocol "github.com/libp2p/go-libp2p-protocol"
+
+	"github.com/libp2p/go-libp2p-core/connmgr"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/protocol"
 )
 
 var (
@@ -38,7 +39,7 @@ type BitSwapNetwork interface {
 
 	NewMessageSender(context.Context, peer.ID) (MessageSender, error)
 
-	ConnectionManager() ifconnmgr.ConnManager
+	ConnectionManager() connmgr.ConnManager
 
 	Stats() Stats
 

diff --git a/network/ipfs_impl.go b/network/ipfs_impl.go
@@ -8,16 +8,17 @@ import (
 	"time"
 
 	bsmsg "github.com/ipfs/go-bitswap/message"
+	"github.com/libp2p/go-libp2p-core/helpers"
 
 	ggio "github.com/gogo/protobuf/io"
 	cid "github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log"
-	host "github.com/libp2p/go-libp2p-host"
-	ifconnmgr "github.com/libp2p/go-libp2p-interface-connmgr"
-	inet "github.com/libp2p/go-libp2p-net"
-	peer "github.com/libp2p/go-libp2p-peer"
-	pstore "github.com/libp2p/go-libp2p-peerstore"
-	routing "github.com/libp2p/go-libp2p-routing"
+	"github.com/libp2p/go-libp2p-core/connmgr"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/network"
+	"github.com/libp2p/go-libp2p-core/peer"
+	peerstore "github.com/libp2p/go-libp2p-core/peerstore"
+	"github.com/libp2p/go-libp2p-core/routing"
 	ma "github.com/multiformats/go-multiaddr"
 )
 
@@ -47,11 +48,11 @@ type impl struct {
 }
 
 type streamMessageSender struct {
-	s inet.Stream
+	s network.Stream
 }
 
 func (s *streamMessageSender) Close() error {
-	return inet.FullClose(s.s)
+	return helpers.FullClose(s.s)
 }
 
 func (s *streamMessageSender) Reset() error {
@@ -62,7 +63,7 @@ func (s *streamMessageSender) SendMsg(ctx context.Context, msg bsmsg.BitSwapMess
 	return msgToStream(ctx, s.s, msg)
 }
 
-func msgToStream(ctx context.Context, s inet.Stream, msg bsmsg.BitSwapMessage) error {
+func msgToStream(ctx context.Context, s network.Stream, msg bsmsg.BitSwapMessage) error {
 	deadline := time.Now().Add(sendMessageTimeout)
 	if dl, ok := ctx.Deadline(); ok {
 		deadline = dl
@@ -102,7 +103,7 @@ func (bsnet *impl) NewMessageSender(ctx context.Context, p peer.ID) (MessageSend
 	return &streamMessageSender{s: s}, nil
 }
 
-func (bsnet *impl) newStreamToPeer(ctx context.Context, p peer.ID) (inet.Stream, error) {
+func (bsnet *impl) newStreamToPeer(ctx context.Context, p peer.ID) (network.Stream, error) {
 	return bsnet.host.NewStream(ctx, p, ProtocolBitswap, ProtocolBitswapOne, ProtocolBitswapNoVers)
 }
 
@@ -123,7 +124,7 @@ func (bsnet *impl) SendMessage(
 	atomic.AddUint64(&bsnet.stats.MessagesSent, 1)
 
 	// TODO(https://github.com/libp2p/go-libp2p-net/issues/28): Avoid this goroutine.
-	go inet.AwaitEOF(s)
+	go helpers.AwaitEOF(s)
 	return s.Close()
 
 }
@@ -139,7 +140,7 @@ func (bsnet *impl) SetDelegate(r Receiver) {
 }
 
 func (bsnet *impl) ConnectTo(ctx context.Context, p peer.ID) error {
-	return bsnet.host.Connect(ctx, pstore.PeerInfo{ID: p})
+	return bsnet.host.Connect(ctx, peer.AddrInfo{ID: p})
 }
 
 // FindProvidersAsync returns a channel of providers for the given key.
@@ -152,7 +153,7 @@ func (bsnet *impl) FindProvidersAsync(ctx context.Context, k cid.Cid, max int) <
 			if info.ID == bsnet.host.ID() {
 				continue // ignore self as provider
 			}
-			bsnet.host.Peerstore().AddAddrs(info.ID, info.Addrs, pstore.TempAddrTTL)
+			bsnet.host.Peerstore().AddAddrs(info.ID, info.Addrs, peerstore.TempAddrTTL)
 			select {
 			case <-ctx.Done():
 				return
@@ -169,15 +170,15 @@ func (bsnet *impl) Provide(ctx context.Context, k cid.Cid) error {
 }
 
 // handleNewStream receives a new stream from the network.
-func (bsnet *impl) handleNewStream(s inet.Stream) {
+func (bsnet *impl) handleNewStream(s network.Stream) {
 	defer s.Close()
 
 	if bsnet.receiver == nil {
 		s.Reset()
 		return
 	}
 
-	reader := ggio.NewDelimitedReader(s, inet.MessageSizeMax)
+	reader := ggio.NewDelimitedReader(s, network.MessageSizeMax)
 	for {
 		received, err := bsmsg.FromPBReader(reader)
 		if err != nil {
@@ -197,7 +198,7 @@ func (bsnet *impl) handleNewStream(s inet.Stream) {
 	}
 }
 
-func (bsnet *impl) ConnectionManager() ifconnmgr.ConnManager {
+func (bsnet *impl) ConnectionManager() connmgr.ConnManager {
 	return bsnet.host.ConnManager()
 }
 
@@ -214,15 +215,15 @@ func (nn *netNotifiee) impl() *impl {
 	return (*impl)(nn)
 }
 
-func (nn *netNotifiee) Connected(n inet.Network, v inet.Conn) {
+func (nn *netNotifiee) Connected(n network.Network, v network.Conn) {
 	nn.impl().receiver.PeerConnected(v.RemotePeer())
 }
 
-func (nn *netNotifiee) Disconnected(n inet.Network, v inet.Conn) {
+func (nn *netNotifiee) Disconnected(n network.Network, v network.Conn) {
 	nn.impl().receiver.PeerDisconnected(v.RemotePeer())
 }
 
-func (nn *netNotifiee) OpenedStream(n inet.Network, v inet.Stream) {}
-func (nn *netNotifiee) ClosedStream(n inet.Network, v inet.Stream) {}
-func (nn *netNotifiee) Listen(n inet.Network, a ma.Multiaddr)      {}
-func (nn *netNotifiee) ListenClose(n inet.Network, a ma.Multiaddr) {}
+func (nn *netNotifiee) OpenedStream(n network.Network, v network.Stream) {}
+func (nn *netNotifiee) ClosedStream(n network.Network, v network.Stream) {}
+func (nn *netNotifiee) Listen(n network.Network, a ma.Multiaddr)         {}
+func (nn *netNotifiee) ListenClose(n network.Network, a ma.Multiaddr)    {}
diff --git a/network/ipfs_impl_test.go b/network/ipfs_impl_test.go
@@ -9,9 +9,10 @@ import (
 	tn "github.com/ipfs/go-bitswap/testnet"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
 	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
-	peer "github.com/libp2p/go-libp2p-peer"
+
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-testing/net"
 	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
-	testutil "github.com/libp2p/go-testutil"
 )
 
 // Receiver is an interface for receiving messages from the GraphSyncNetwork.
@@ -62,8 +63,8 @@ func TestMessageSendAndReceive(t *testing.T) {
 	if err != nil {
 		t.Fatal("Unable to setup network")
 	}
-	p1 := testutil.RandIdentityOrFatal(t)
-	p2 := testutil.RandIdentityOrFatal(t)
+	p1 := tnet.RandIdentityOrFatal(t)
+	p2 := tnet.RandIdentityOrFatal(t)
 
 	bsnet1 := streamNet.Adapter(p1)
 	bsnet2 := streamNet.Adapter(p2)

diff --git a/peermanager/peermanager.go b/peermanager/peermanager.go
@@ -6,7 +6,7 @@ import (
 	bsmsg "github.com/ipfs/go-bitswap/message"
 	wantlist "github.com/ipfs/go-bitswap/wantlist"
 
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 // PeerQueue provides a queer of messages to be sent for a single peer.

diff --git a/peermanager/peermanager_test.go b/peermanager/peermanager_test.go
@@ -10,7 +10,7 @@ import (
 
 	bsmsg "github.com/ipfs/go-bitswap/message"
 	wantlist "github.com/ipfs/go-bitswap/wantlist"
-	"github.com/libp2p/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-core/peer"
 )
 
 type messageSent struct {

diff --git a/providerquerymanager/providerquerymanager.go b/providerquerymanager/providerquerymanager.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 var log = logging.Logger("bitswap")

diff --git a/providerquerymanager/providerquerymanager_test.go b/providerquerymanager/providerquerymanager_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/ipfs/go-bitswap/testutil"
 
 	cid "github.com/ipfs/go-cid"
-	"github.com/libp2p/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-core/peer"
 )
 
 type fakeProviderNetwork struct {

diff --git a/session/session.go b/session/session.go
@@ -10,8 +10,8 @@ import (
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 	loggables "github.com/libp2p/go-libp2p-loggables"
-	peer "github.com/libp2p/go-libp2p-peer"
 
 	bssrs "github.com/ipfs/go-bitswap/sessionrequestsplitter"
 )

diff --git a/session/session_test.go b/session/session_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ipfs/go-bitswap/testutil"
 	cid "github.com/ipfs/go-cid"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 type wantReq struct {

diff --git a/sessionmanager/sessionmanager.go b/sessionmanager/sessionmanager.go
@@ -9,7 +9,7 @@ import (
 
 	bssession "github.com/ipfs/go-bitswap/session"
 	exchange "github.com/ipfs/go-ipfs-exchange-interface"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 // Session is a session that is managed by the session manager

diff --git a/sessionmanager/sessionmanager_test.go b/sessionmanager/sessionmanager_test.go
@@ -11,7 +11,7 @@ import (
 
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 type fakeSession struct {

diff --git a/sessionpeermanager/sessionpeermanager.go b/sessionpeermanager/sessionpeermanager.go
@@ -6,7 +6,7 @@ import (
 	"math/rand"
 
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 const (

diff --git a/sessionpeermanager/sessionpeermanager_test.go b/sessionpeermanager/sessionpeermanager_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/ipfs/go-bitswap/testutil"
 
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
 type fakePeerProviderFinder struct {

diff --git a/sessionrequestsplitter/sessionrequestsplitter.go b/sessionrequestsplitter/sessionrequestsplitter.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/ipfs/go-cid"
-	"github.com/libp2p/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-core/peer"
 )
 
 const (