Commit 7c5676ac authored by Steven Allen's avatar Steven Allen

feat: update for go-libp2p-core 0.7.0 interface changes

parent 179650d3
...@@ -3,32 +3,31 @@ module github.com/ipfs/go-bitswap ...@@ -3,32 +3,31 @@ module github.com/ipfs/go-bitswap
require ( require (
github.com/cskr/pubsub v1.0.2 github.com/cskr/pubsub v1.0.2
github.com/gogo/protobuf v1.3.1 github.com/gogo/protobuf v1.3.1
github.com/golang/protobuf v1.3.2 // indirect github.com/google/uuid v1.1.2
github.com/google/uuid v1.1.1
github.com/ipfs/go-block-format v0.0.2 github.com/ipfs/go-block-format v0.0.2
github.com/ipfs/go-cid v0.0.5 github.com/ipfs/go-cid v0.0.7
github.com/ipfs/go-datastore v0.4.4 github.com/ipfs/go-datastore v0.4.5
github.com/ipfs/go-detect-race v0.0.1 github.com/ipfs/go-detect-race v0.0.1
github.com/ipfs/go-ipfs-blockstore v0.1.4 github.com/ipfs/go-ipfs-blockstore v0.1.4
github.com/ipfs/go-ipfs-blocksutil v0.0.1 github.com/ipfs/go-ipfs-blocksutil v0.0.1
github.com/ipfs/go-ipfs-delay v0.0.1 github.com/ipfs/go-ipfs-delay v0.0.1
github.com/ipfs/go-ipfs-exchange-interface v0.0.1 github.com/ipfs/go-ipfs-exchange-interface v0.0.1
github.com/ipfs/go-ipfs-routing v0.1.0 github.com/ipfs/go-ipfs-routing v0.1.0
github.com/ipfs/go-ipfs-util v0.0.1 github.com/ipfs/go-ipfs-util v0.0.2
github.com/ipfs/go-log v1.0.4 github.com/ipfs/go-log v1.0.4
github.com/ipfs/go-metrics-interface v0.0.1 github.com/ipfs/go-metrics-interface v0.0.1
github.com/ipfs/go-peertaskqueue v0.2.0 github.com/ipfs/go-peertaskqueue v0.2.0
github.com/jbenet/goprocess v0.1.4 github.com/jbenet/goprocess v0.1.4
github.com/libp2p/go-buffer-pool v0.0.2 github.com/libp2p/go-buffer-pool v0.0.2
github.com/libp2p/go-libp2p v0.8.3 github.com/libp2p/go-libp2p v0.12.0
github.com/libp2p/go-libp2p-core v0.5.2 github.com/libp2p/go-libp2p-core v0.7.0
github.com/libp2p/go-libp2p-loggables v0.1.0 github.com/libp2p/go-libp2p-loggables v0.1.0
github.com/libp2p/go-libp2p-netutil v0.1.0 github.com/libp2p/go-libp2p-netutil v0.1.0
github.com/libp2p/go-libp2p-testing v0.1.1 github.com/libp2p/go-libp2p-testing v0.3.0
github.com/libp2p/go-msgio v0.0.4 github.com/libp2p/go-msgio v0.0.6
github.com/multiformats/go-multiaddr v0.2.1 github.com/multiformats/go-multiaddr v0.3.1
github.com/multiformats/go-multistream v0.1.1 github.com/multiformats/go-multistream v0.2.0
go.uber.org/zap v1.14.1 go.uber.org/zap v1.16.0
) )
go 1.12 go 1.12
This diff is collapsed.
...@@ -13,7 +13,6 @@ import ( ...@@ -13,7 +13,6 @@ import (
cid "github.com/ipfs/go-cid" cid "github.com/ipfs/go-cid"
logging "github.com/ipfs/go-log" logging "github.com/ipfs/go-log"
"github.com/libp2p/go-libp2p-core/connmgr" "github.com/libp2p/go-libp2p-core/connmgr"
"github.com/libp2p/go-libp2p-core/helpers"
"github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/host"
"github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/network"
"github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/peer"
...@@ -132,7 +131,7 @@ func (s *streamMessageSender) Reset() error { ...@@ -132,7 +131,7 @@ func (s *streamMessageSender) Reset() error {
// Close the stream // Close the stream
func (s *streamMessageSender) Close() error { func (s *streamMessageSender) Close() error {
return helpers.FullClose(s.stream) return s.stream.Close()
} }
// Indicates whether the peer supports HAVE / DONT_HAVE messages // Indicates whether the peer supports HAVE / DONT_HAVE messages
...@@ -323,9 +322,6 @@ func (bsnet *impl) SendMessage( ...@@ -323,9 +322,6 @@ func (bsnet *impl) SendMessage(
return err return err
} }
// TODO(https://github.com/libp2p/go-libp2p-net/issues/28): Avoid this goroutine.
//nolint
go helpers.AwaitEOF(s)
return s.Close() return s.Close()
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment