revert: integration of graphsync-v0.9.0 until we are ready to test th…

…e whole stack with it (#249)
ipfs · Sep 2, 2021 · b0599c7 · b0599c7
1 parent 4472a8e
commit b0599c7
Show file tree

Hide file tree

Showing 24 changed files with 138 additions and 206 deletions.
diff --git a/benchmarks/testinstance/testinstance.go b/benchmarks/testinstance/testinstance.go
@@ -109,7 +109,8 @@ func Close(instances []Instance) error {
 // Instance is a test instance of bitswap + dependencies for integration testing
 type Instance struct {
 	Peer            peer.ID
-	LinkSystem      ipld.LinkSystem
+	Loader          ipld.Loader
+	Storer          ipld.Storer
 	BlockStore      blockstore.Blockstore
 	Graphsync       graphsync.GraphExchange
 	Manager         datatransfer.Manager
@@ -163,8 +164,9 @@ func NewInstance(ctx context.Context, net tn.Network, tempDir string, diskBasedD
 		return Instance{}, err
 	}
 
-	linkSystem := storeutil.LinkSystemForBlockstore(bstore)
-	gs := gsimpl.New(ctx, gsNet, linkSystem, gsimpl.RejectAllRequestsByDefault())
+	loader := storeutil.LoaderForBlockstore(bstore)
+	storer := storeutil.StorerForBlockstore(bstore)
+	gs := gsimpl.New(ctx, gsNet, loader, storer, gsimpl.RejectAllRequestsByDefault())
 	transport := gstransport.NewTransport(p, gs)
 	dt, err := dtimpl.NewDataTransfer(namespace.Wrap(dstore, datastore.NewKey("/data-transfers/transfers")), os.TempDir(), dtNet, transport)
 	if err != nil {
@@ -196,7 +198,8 @@ func NewInstance(ctx context.Context, net tn.Network, tempDir string, diskBasedD
 		Peer:            p,
 		Graphsync:       gs,
 		Manager:         dt,
-		LinkSystem:      linkSystem,
+		Loader:          loader,
+		Storer:          storer,
 		BlockStore:      bstore,
 		blockstoreDelay: bsdelay,
 		ds:              dstore,

diff --git a/channels/channel_state.go b/channels/channel_state.go
@@ -81,7 +81,7 @@ func (c channelState) BaseCID() cid.Cid { return c.baseCid }
 func (c channelState) Selector() ipld.Node {
 	builder := basicnode.Prototype.Any.NewBuilder()
 	reader := bytes.NewReader(c.selector.Raw)
-	err := dagcbor.Decode(builder, reader)
+	err := dagcbor.Decoder(builder, reader)
 	if err != nil {
 		log.Error(err)
 	}

diff --git a/channels/channels_test.go b/channels/channels_test.go
@@ -436,7 +436,7 @@ func TestMigrationsV0(t *testing.T) {
 
 	allSelector := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any).Matcher().Node()
 	allSelectorBuf := new(bytes.Buffer)
-	err := dagcbor.Encode(allSelector, allSelectorBuf)
+	err := dagcbor.Encoder(allSelector, allSelectorBuf)
 	require.NoError(t, err)
 	allSelectorBytes := allSelectorBuf.Bytes()
 
@@ -556,7 +556,7 @@ func TestMigrationsV1(t *testing.T) {
 	receivedCids := make([][]cid.Cid, numChannels)
 	allSelector := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any).Matcher().Node()
 	allSelectorBuf := new(bytes.Buffer)
-	err := dagcbor.Encode(allSelector, allSelectorBuf)
+	err := dagcbor.Encoder(allSelector, allSelectorBuf)
 	require.NoError(t, err)
 	allSelectorBytes := allSelectorBuf.Bytes()
 	selfPeer := testutil.GeneratePeers(1)[0]

diff --git a/channels/internal/internalchannel_cbor_gen.go b/channels/internal/internalchannel_cbor_gen.go
diff --git a/channels/internal/migrations/v0/v0_cbor_gen.go b/channels/internal/migrations/v0/v0_cbor_gen.go
diff --git a/channels/internal/migrations/v1/v1_cbor_gen.go b/channels/internal/migrations/v1/v1_cbor_gen.go
diff --git a/encoding/encoding.go b/encoding/encoding.go
@@ -27,7 +27,7 @@ func Encode(value Encodable) ([]byte, error) {
 	}
 	if ipldEncodable, ok := value.(ipld.Node); ok {
 		buf := new(bytes.Buffer)
-		err := dagcbor.Encode(ipldEncodable, buf)
+		err := dagcbor.Encoder(ipldEncodable, buf)
 		if err != nil {
 			return nil, err
 		}
@@ -79,7 +79,7 @@ type ipldDecoder struct {
 func (decoder *ipldDecoder) DecodeFromCbor(encoded []byte) (Encodable, error) {
 	builder := decoder.style.NewBuilder()
 	buf := bytes.NewReader(encoded)
-	err := dagcbor.Decode(builder, buf)
+	err := dagcbor.Decoder(builder, buf)
 	if err != nil {
 		return nil, err
 	}

diff --git a/go.mod b/go.mod
@@ -8,33 +8,31 @@ require (
 	github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe
 	github.com/hannahhoward/cbor-gen-for v0.0.0-20200817222906-ea96cece81f1
 	github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e
-	github.com/ipfs/go-block-format v0.0.3
+	github.com/ipfs/go-block-format v0.0.2
 	github.com/ipfs/go-blockservice v0.1.3
 	github.com/ipfs/go-cid v0.0.7
 	github.com/ipfs/go-datastore v0.4.5
-	github.com/ipfs/go-ds-badger v0.2.6
-	github.com/ipfs/go-graphsync v0.9.0
+	github.com/ipfs/go-ds-badger v0.2.3
+	github.com/ipfs/go-graphsync v0.6.8
 	github.com/ipfs/go-ipfs-blockstore v1.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-delay v0.0.1
 	github.com/ipfs/go-ipfs-exchange-offline v0.0.1
 	github.com/ipfs/go-ipfs-files v0.0.8
-	github.com/ipfs/go-ipld-cbor v0.0.5
+	github.com/ipfs/go-ipld-cbor v0.0.4
 	github.com/ipfs/go-ipld-format v0.2.0
 	github.com/ipfs/go-log/v2 v2.1.1
 	github.com/ipfs/go-merkledag v0.3.2
 	github.com/ipfs/go-unixfs v0.2.4
-	github.com/ipld/go-ipld-prime v0.12.0
+	github.com/ipld/go-ipld-prime v0.5.1-0.20201021195245-109253e8a018
 	github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
 	github.com/jpillora/backoff v1.0.0
-	github.com/libp2p/go-libp2p v0.13.0
-	github.com/libp2p/go-libp2p-core v0.8.5
-	github.com/libp2p/go-libp2p-record v0.1.1 // indirect
+	github.com/libp2p/go-libp2p v0.12.0
+	github.com/libp2p/go-libp2p-core v0.7.0
 	github.com/stretchr/testify v1.6.1
-	github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2
+	github.com/whyrusleeping/cbor-gen v0.0.0-20200826160007-0b9f6c5fb163
 	go.uber.org/atomic v1.6.0
-	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
-	golang.org/x/tools v0.1.1-0.20210225150353-54dc8c5edb56 // indirect
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 )