fixup! feat(libp2p): add v1.0.0 network compatibility

Author: rvagg

impl/graphsync_test.go

@@ -43,7 +43,6 @@ import (
 	"github.com/ipfs/go-graphsync/donotsendfirstblocks"
 	"github.com/ipfs/go-graphsync/ipldutil"
 	gsmsg "github.com/ipfs/go-graphsync/message"
-	"github.com/ipfs/go-graphsync/network"
 	gsnet "github.com/ipfs/go-graphsync/network"
 	"github.com/ipfs/go-graphsync/requestmanager/hooks"
 	"github.com/ipfs/go-graphsync/storeutil"
@@ -62,9 +61,9 @@ var protocolsForTest = map[string]struct {
 	host2Protocols []protocol.ID
 }{
 	"(v1.1 -> v1.1)": {nil, nil},
-	"(v1.0 -> v1.1)": {[]protocol.ID{network.ProtocolGraphsync_1_0_0}, nil},
-	"(v1.1 -> v1.0)": {nil, []protocol.ID{network.ProtocolGraphsync_1_0_0}},
-	"(v1.0 -> v1.0)": {[]protocol.ID{network.ProtocolGraphsync_1_0_0}, []protocol.ID{network.ProtocolGraphsync_1_0_0}},
+	"(v1.0 -> v1.1)": {[]protocol.ID{gsnet.ProtocolGraphsync_1_0_0}, nil},
+	"(v1.1 -> v1.0)": {nil, []protocol.ID{gsnet.ProtocolGraphsync_1_0_0}},
+	"(v1.0 -> v1.0)": {[]protocol.ID{gsnet.ProtocolGraphsync_1_0_0}, []protocol.ID{gsnet.ProtocolGraphsync_1_0_0}},
 }
 
 func TestMakeRequestToNetwork(t *testing.T) {
@@ -1723,14 +1722,14 @@ func newOptionalGsTestData(ctx context.Context, t *testing.T, network1Protocols
 	err = td.mn.LinkAll()
 	require.NoError(t, err, "error linking hosts")
 
-	opts := make([]network.Option, 0)
+	opts := make([]gsnet.Option, 0)
 	if network1Protocols != nil {
-		opts = append(opts, network.GraphsyncProtocols(network1Protocols))
+		opts = append(opts, gsnet.GraphsyncProtocols(network1Protocols))
 	}
 	td.gsnet1 = gsnet.NewFromLibp2pHost(td.host1, opts...)
-	opts = make([]network.Option, 0)
+	opts = make([]gsnet.Option, 0)
 	if network2Protocols != nil {
-		opts = append(opts, network.GraphsyncProtocols(network2Protocols))
+		opts = append(opts, gsnet.GraphsyncProtocols(network2Protocols))
 	}
 	td.gsnet2 = gsnet.NewFromLibp2pHost(td.host2, opts...)
 	td.blockStore1 = make(map[ipld.Link][]byte)

message/message.go

@@ -59,7 +59,7 @@ func (gsr GraphSyncRequest) String() string {
 	var buf bytes.Buffer
 	dagjson.Encode(gsr.selector, &buf)
 	ext := make([]string, 0)
-	for s, _ := range gsr.extensions {
+	for s := range gsr.extensions {
 		ext = append(ext, s)
 	}
 	return fmt.Sprintf("GraphSyncRequest<root=%s, selector=%s, priority=%d, id=%s, cancel=%v, update=%v, exts=%s>",
@@ -84,7 +84,7 @@ type GraphSyncResponse struct {
 // String returns a human-readable form of a GraphSyncResponse
 func (gsr GraphSyncResponse) String() string {
 	ext := make([]string, 0)
-	for s, _ := range gsr.extensions {
+	for s := range gsr.extensions {
 		ext = append(ext, s)
 	}
 	return fmt.Sprintf("GraphSyncResponse<id=%s, status=%d, exts=%s>",