Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-graphsync
Commits
2008113f
Unverified
Commit
2008113f
authored
Nov 12, 2020
by
Steven Allen
Committed by
GitHub
Nov 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: use go-libp2p-core 0.7.0 stream interfaces (#116)
parent
1e1e872c
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
195 additions
and
24 deletions
+195
-24
go.mod
go.mod
+10
-12
go.sum
go.sum
+184
-6
network/libp2p_impl.go
network/libp2p_impl.go
+1
-6
No files found.
go.mod
View file @
2008113f
...
@@ -9,9 +9,9 @@ require (
...
@@ -9,9 +9,9 @@ require (
github.com/hannahhoward/go-pubsub
v0.0.0-20200423002714-8d62886cc36e
github.com/hannahhoward/go-pubsub
v0.0.0-20200423002714-8d62886cc36e
github.com/ipfs/go-block-format
v0.0.2
github.com/ipfs/go-block-format
v0.0.2
github.com/ipfs/go-blockservice
v0.1.3
github.com/ipfs/go-blockservice
v0.1.3
github.com/ipfs/go-cid
v0.0.
6
github.com/ipfs/go-cid
v0.0.
7
github.com/ipfs/go-datastore
v0.4.4
github.com/ipfs/go-datastore
v0.4.4
github.com/ipfs/go-ds-badger
v0.2.
1
github.com/ipfs/go-ds-badger
v0.2.
3
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-chunker
v0.0.5
github.com/ipfs/go-ipfs-chunker
v0.0.5
...
@@ -20,32 +20,30 @@ require (
...
@@ -20,32 +20,30 @@ require (
github.com/ipfs/go-ipfs-files
v0.0.8
github.com/ipfs/go-ipfs-files
v0.0.8
github.com/ipfs/go-ipfs-pq
v0.0.2
github.com/ipfs/go-ipfs-pq
v0.0.2
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-ipld-cbor
v0.0.4 // indirect
github.com/ipfs/go-ipld-cbor
v0.0.4 // indirect
github.com/ipfs/go-ipld-format
v0.2.0
github.com/ipfs/go-ipld-format
v0.2.0
github.com/ipfs/go-log
v1.0.
3
github.com/ipfs/go-log
v1.0.
4
github.com/ipfs/go-merkledag
v0.3.1
github.com/ipfs/go-merkledag
v0.3.1
github.com/ipfs/go-peertaskqueue
v0.2.0
github.com/ipfs/go-peertaskqueue
v0.2.0
github.com/ipfs/go-unixfs
v0.2.4
github.com/ipfs/go-unixfs
v0.2.4
github.com/ipld/go-ipld-prime
v0.5.1-0.20201021195245-109253e8a018
github.com/ipld/go-ipld-prime
v0.5.1-0.20201021195245-109253e8a018
github.com/ipld/go-ipld-prime-proto
v0.1.0
github.com/ipld/go-ipld-prime-proto
v0.1.0
github.com/jbenet/go-random
v0.0.0-20190219211222-123a90aedc0c
github.com/jbenet/go-random
v0.0.0-20190219211222-123a90aedc0c
github.com/jbenet/goprocess
v0.1.4 // indirect
github.com/libp2p/go-buffer-pool
v0.0.2
github.com/libp2p/go-buffer-pool
v0.0.2
github.com/libp2p/go-libp2p
v0.
6
.0
github.com/libp2p/go-libp2p
v0.
12
.0
github.com/libp2p/go-libp2p-core
v0.
5
.0
github.com/libp2p/go-libp2p-core
v0.
7
.0
github.com/libp2p/go-libp2p-netutil
v0.1.0
github.com/libp2p/go-libp2p-netutil
v0.1.0
github.com/libp2p/go-libp2p-peer
v0.2.0
github.com/libp2p/go-libp2p-peer
v0.2.0
github.com/libp2p/go-libp2p-record
v0.1.1 // indirect
github.com/libp2p/go-libp2p-record
v0.1.1 // indirect
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.6
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-multihash
v0.0.1
3
github.com/multiformats/go-multihash
v0.0.1
4
github.com/polydawn/refmt
v0.0.0-20190809202753-05966cbd336a // indirect
github.com/polydawn/refmt
v0.0.0-20190809202753-05966cbd336a // indirect
github.com/smartystreets/assertions
v1.0.1 // indirect
github.com/smartystreets/assertions
v1.0.1 // indirect
github.com/stretchr/testify
v1.
5
.1
github.com/stretchr/testify
v1.
6
.1
github.com/whyrusleeping/cbor-gen
v0.0.0-20200710004633-5379fc63235d
github.com/whyrusleeping/cbor-gen
v0.0.0-20200710004633-5379fc63235d
go.uber.org/multierr
v1.4.0 // indirect
golang.org/x/tools
v0.0.0-20200827010519-17fd2f27a9e3 // indirect
golang.org/x/tools
v0.0.0-20200827010519-17fd2f27a9e3 // indirect
golang.org/x/xerrors
v0.0.0-20191204190536-9bdfabe68543
golang.org/x/xerrors
v0.0.0-20191204190536-9bdfabe68543
google.golang.org/protobuf
v1.25.0
google.golang.org/protobuf
v1.25.0
...
...
go.sum
View file @
2008113f
This diff is collapsed.
Click to expand it.
network/libp2p_impl.go
View file @
2008113f
...
@@ -7,7 +7,6 @@ import (
...
@@ -7,7 +7,6 @@ import (
"time"
"time"
logging
"github.com/ipfs/go-log"
logging
"github.com/ipfs/go-log"
"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"
...
@@ -43,7 +42,7 @@ type streamMessageSender struct {
...
@@ -43,7 +42,7 @@ type streamMessageSender struct {
}
}
func
(
s
*
streamMessageSender
)
Close
()
error
{
func
(
s
*
streamMessageSender
)
Close
()
error
{
return
helpers
.
Full
Close
(
s
.
s
)
return
s
.
s
.
Close
()
}
}
func
(
s
*
streamMessageSender
)
Reset
()
error
{
func
(
s
*
streamMessageSender
)
Reset
()
error
{
...
@@ -110,11 +109,7 @@ func (gsnet *libp2pGraphSyncNetwork) SendMessage(
...
@@ -110,11 +109,7 @@ func (gsnet *libp2pGraphSyncNetwork) 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
()
}
}
func
(
gsnet
*
libp2pGraphSyncNetwork
)
SetDelegate
(
r
Receiver
)
{
func
(
gsnet
*
libp2pGraphSyncNetwork
)
SetDelegate
(
r
Receiver
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment