Rebase and fix conflicts

ipni · Mar 15, 2022 · 01cc679 · 01cc679
1 parent cd15047
commit 01cc679
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/cmd/go.sum b/cmd/go.sum
@@ -1465,10 +1465,6 @@ github.com/whyrusleeping/cbor-gen v0.0.0-20200810223238-211df3b9e24c/go.mod h1:f
 github.com/whyrusleeping/cbor-gen v0.0.0-20200812213548-958ddffe352c/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 github.com/whyrusleeping/cbor-gen v0.0.0-20200826160007-0b9f6c5fb163/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
-<<<<<<< HEAD
-github.com/whyrusleeping/cbor-gen v0.0.0-20220224212727-7a699437a831/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
-=======
->>>>>>> Use new metadata api with multi-protocol support
 github.com/whyrusleeping/cbor-gen v0.0.0-20220302191723-37c43cae8e14 h1:vo2wkP2ceHyGyZwFFtAabpot03EeSxxwAe57pOI9E/4=
 github.com/whyrusleeping/cbor-gen v0.0.0-20220302191723-37c43cae8e14/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E=

diff --git a/engine/engine_test.go b/engine/engine_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/filecoin-project/index-provider/engine"
 	"github.com/filecoin-project/index-provider/metadata"
 	"github.com/filecoin-project/index-provider/testutil"
+	stiapi "github.com/filecoin-project/storetheindex/api/v0"
 	"github.com/filecoin-project/storetheindex/api/v0/ingest/schema"
-	v0util "github.com/filecoin-project/storetheindex/api/v0/util"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
@@ -59,12 +59,16 @@ func TestEngine_PublishLocal(t *testing.T) {
 	})
 	require.NoError(t, err)
 
+	metadata := stiapi.ParsedMetadata{Protocols: []stiapi.ProtocolMetadata{&metadata.BitswapMetadata{}}}
+	encMeta, err := metadata.MarshalBinary()
+	require.NoError(t, err)
+
 	wantAd, err := schema.NewAdvertisement(
 		subject.Key(),
 		nil,
 		chunkLnk,
 		[]byte("fish"),
-		metadata.BitswapMetadata,
+		stiapi.Metadata(encMeta),
 		false,
 		subject.Host().ID().String(),
 		multiAddsToString(subject.Host().Addrs()))
@@ -150,12 +154,16 @@ func TestEngine_PublishWithDataTransferPublisher(t *testing.T) {
 	})
 	require.NoError(t, err)
 
+	metadata := stiapi.ParsedMetadata{Protocols: []stiapi.ProtocolMetadata{&metadata.BitswapMetadata{}}}
+	encMeta, err := metadata.MarshalBinary()
+	require.NoError(t, err)
+
 	wantAd, err := schema.NewAdvertisement(
 		subject.Key(),
 		nil,
 		chunkLnk,
 		wantContextID,
-		metadata.BitswapMetadata,
+		stiapi.Metadata(encMeta),
 		false,
 		subject.Host().ID().String(),
 		multiAddsToString(subject.Host().Addrs()))
@@ -225,7 +233,9 @@ func TestEngine_NotifyPutWithoutListerIsError(t *testing.T) {
 	require.NoError(t, err)
 	defer subject.Shutdown()
 
-	gotCid, err := subject.NotifyPut(ctx, []byte("fish"), metadata.BitswapMetadata)
+	parsedMetadata := stiapi.ParsedMetadata{Protocols: []stiapi.ProtocolMetadata{&metadata.BitswapMetadata{}}}
+
+	gotCid, err := subject.NotifyPut(ctx, []byte("fish"), parsedMetadata)
 	require.Error(t, err, provider.ErrNoMultihashLister)
 	require.Equal(t, cid.Undef, gotCid)
 }
@@ -253,7 +263,9 @@ func TestEngine_NotifyPutThenNotifyRemove(t *testing.T) {
 		return nil, errors.New("not found")
 	})
 
-	gotPutAdCid, err := subject.NotifyPut(ctx, wantContextID, metadata.BitswapMetadata)
+	parsedMetadata := stiapi.ParsedMetadata{Protocols: []stiapi.ProtocolMetadata{&metadata.BitswapMetadata{}}}
+
+	gotPutAdCid, err := subject.NotifyPut(ctx, wantContextID, parsedMetadata)
 	require.NoError(t, err)
 	require.NotEqual(t, cid.Undef, gotPutAdCid)
 

diff --git a/go.sum b/go.sum
@@ -1450,10 +1450,6 @@ github.com/whyrusleeping/cbor-gen v0.0.0-20200810223238-211df3b9e24c/go.mod h1:f
 github.com/whyrusleeping/cbor-gen v0.0.0-20200812213548-958ddffe352c/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 github.com/whyrusleeping/cbor-gen v0.0.0-20200826160007-0b9f6c5fb163/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
-<<<<<<< HEAD
-github.com/whyrusleeping/cbor-gen v0.0.0-20220224212727-7a699437a831/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
-=======
->>>>>>> Use new metadata api with multi-protocol support
 github.com/whyrusleeping/cbor-gen v0.0.0-20220302191723-37c43cae8e14 h1:vo2wkP2ceHyGyZwFFtAabpot03EeSxxwAe57pOI9E/4=
 github.com/whyrusleeping/cbor-gen v0.0.0-20220302191723-37c43cae8e14/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E=