Skip to content

Commit 40738e4

Browse files
aschmahmannaschmahmann
authored
Merge pull request #7598 from ipfs/chore/bump-graphsync-dep
Upgrade graphsync deps
2 parents 7abaaa4 + 90a5733 commit 40738e4

File tree

7 files changed

+381
-146
lines changed

7 files changed

+381
-146
lines changed

‎core/node/graphsync.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ package node
33
import (
44
"github.com/ipfs/go-graphsync"
55
gsimpl "github.com/ipfs/go-graphsync/impl"
6-
"github.com/ipfs/go-graphsync/ipldbridge"
76
"github.com/ipfs/go-graphsync/network"
87
"github.com/ipfs/go-graphsync/storeutil"
9-
"github.com/ipfs/go-ipfs-blockstore"
8+
blockstore "github.com/ipfs/go-ipfs-blockstore"
109
libp2p "github.com/libp2p/go-libp2p-core"
1110
"go.uber.org/fx"
1211

@@ -18,9 +17,7 @@ func Graphsync(lc fx.Lifecycle, mctx helpers.MetricsCtx, host libp2p.Host, bs bl
1817
ctx := helpers.LifecycleCtx(mctx, lc)
1918

2019
network := network.NewFromLibp2pHost(host)
21-
ipldBridge := ipldbridge.NewIPLDBridge()
22-
return gsimpl.New(ctx,
23-
network, ipldBridge,
20+
return gsimpl.New(ctx, network,
2421
storeutil.LoaderForBlockstore(bs),
2522
storeutil.StorerForBlockstore(bs),
2623
)

‎docs/examples/go-ipfs-as-a-library/go.mod

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ module github.com/ipfs/go-ipfs/examples/go-ipfs-as-a-library
33
go 1.14
44

55
require (
6-
github.com/ipfs/go-ipfs v0.5.0
7-
github.com/ipfs/go-ipfs-config v0.5.3
6+
github.com/ipfs/go-ipfs v0.7.0
7+
github.com/ipfs/go-ipfs-config v0.9.0
88
github.com/ipfs/go-ipfs-files v0.0.8
9-
github.com/ipfs/interface-go-ipfs-core v0.2.7
10-
github.com/libp2p/go-libp2p-core v0.5.2
11-
github.com/libp2p/go-libp2p-peerstore v0.2.3
12-
github.com/multiformats/go-multiaddr v0.2.1
9+
github.com/ipfs/interface-go-ipfs-core v0.4.0
10+
github.com/libp2p/go-libp2p-core v0.6.0
11+
github.com/libp2p/go-libp2p-peerstore v0.2.6
12+
github.com/multiformats/go-multiaddr v0.2.2
1313
)
14+
15+
replace github.com/ipfs/go-ipfs => ./../../..

‎docs/examples/go-ipfs-as-a-library/go.sum

Lines changed: 340 additions & 104 deletions
Large diffs are not rendered by default.

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/ipfs/go-ds-measure v0.1.0
2929
github.com/ipfs/go-filestore v0.0.3
3030
github.com/ipfs/go-fs-lock v0.0.5
31-
github.com/ipfs/go-graphsync v0.0.5
31+
github.com/ipfs/go-graphsync v0.1.1
3232
github.com/ipfs/go-ipfs-blockstore v0.1.4
3333
github.com/ipfs/go-ipfs-chunker v0.0.5
3434
github.com/ipfs/go-ipfs-cmds v0.3.0
@@ -55,7 +55,7 @@ require (
5555
github.com/ipfs/go-unixfs v0.2.4
5656
github.com/ipfs/go-verifcid v0.0.1
5757
github.com/ipfs/interface-go-ipfs-core v0.4.0
58-
github.com/ipld/go-car v0.1.0
58+
github.com/ipld/go-car v0.1.1-0.20200429200904-c222d793c339
5959
github.com/jbenet/go-is-domain v1.0.5
6060
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
6161
github.com/jbenet/go-temp-err-catcher v0.1.0

‎go.sum

Lines changed: 26 additions & 26 deletions
Large diffs are not rendered by default.

‎test/dependencies/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/ipfs/go-cid v0.0.6
1010
github.com/ipfs/go-cidutil v0.0.2
1111
github.com/ipfs/go-datastore v0.4.4
12-
github.com/ipfs/go-graphsync v0.0.6-0.20200428204348-97a8cf76a482
12+
github.com/ipfs/go-graphsync v0.1.1
1313
github.com/ipfs/go-ipfs-blockstore v1.0.0
1414
github.com/ipfs/go-ipfs-exchange-offline v0.0.1
1515
github.com/ipfs/go-log v1.0.4

‎test/dependencies/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBR
285285
github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIykR4L04tMOYc=
286286
github.com/ipfs/go-ds-leveldb v0.4.1/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
287287
github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
288-
github.com/ipfs/go-graphsync v0.0.6-0.20200428204348-97a8cf76a482 h1:sEjqnTXzaK3BozXUeDdLKrHZCDX7qPmcypdWwnfKKDs=
289-
github.com/ipfs/go-graphsync v0.0.6-0.20200428204348-97a8cf76a482/go.mod h1:jMXfqIEDFukLPZHqDPp8tJMbHO9Rmeb9CEGevngQbmE=
288+
github.com/ipfs/go-graphsync v0.1.1 h1:bFDAYS0Z48yd8ROPI6f/zIVmJxaDLA6m8cVuJPKC5fE=
289+
github.com/ipfs/go-graphsync v0.1.1/go.mod h1:jMXfqIEDFukLPZHqDPp8tJMbHO9Rmeb9CEGevngQbmE=
290290
github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08=
291291
github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod h1:5aD0AvHPi7mZc6Ci1WCAhiBQu2IsfTduLl+422H6Rqw=
292292
github.com/ipfs/go-ipfs-blockstore v0.1.4/go.mod h1:Jxm3XMVjh6R17WvxFEiyKBLUGr86HgIYJW/D/MwqeYQ=

0 commit comments

Comments
 (0)