Merge pull request #1 from filecoin-project/feat/update-v0.13.x-deps

update v0.13.x deps

.github/workflows/automerge.yml

@@ -1,53 +1,11 @@
 # File managed by web3-bot. DO NOT EDIT.
 # See https://github.com/protocol/.github/ for details.
 
-# Automatically merge pull requests opened by web3-bot, as soon as (and only if) all tests pass.
-# This reduces the friction associated with updating with our workflows.
-
-on: [ pull_request ]
 name: Automerge
+on: [ pull_request ]
 
 jobs:
-  automerge-check:
-    if: github.event.pull_request.user.login == 'web3-bot'
-    runs-on: ubuntu-latest
-    outputs:
-      status: ${{ steps.should-automerge.outputs.status }}
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Check if we should automerge
-      id: should-automerge
-      run: |
-        for commit in $(git rev-list --first-parent origin/${{ github.event.pull_request.base.ref }}..${{ github.event.pull_request.head.sha }}); do
-          committer=$(git show --format=$'%ce' -s $commit)
-          echo "Committer: $committer"
-          if [[ "$committer" != "[email protected]" ]]; then
-            echo "Commit $commit wasn't committed by web3-bot, but by $committer."
-            echo "::set-output name=status::false"
-            exit
-          fi
-        done
-        echo "::set-output name=status::true"
   automerge:
-    needs: automerge-check
-    runs-on: ubuntu-latest
-    # The check for the user is redundant here, as this job depends on the automerge-check job,
-    # but it prevents this job from spinning up, just to be skipped shortly after.
-    if: github.event.pull_request.user.login == 'web3-bot' && needs.automerge-check.outputs.status == 'true'
-    steps:
-    - name: Wait on tests
-      uses: lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa # v0.2
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        wait-interval: 10
-        running-workflow-name: 'automerge' # the name of this job
-    - name: Merge PR
-      uses: pascalgn/automerge-action@741c311a47881be9625932b0a0de1b0937aab1ae # v0.13.1
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        MERGE_LABELS: ""
-        MERGE_METHOD: "squash"
-        MERGE_DELETE_BRANCH: true
+    uses: protocol/.github/.github/workflows/automerge.yml@master
+    with:
+      job: 'automerge'

.github/workflows/go-check.yml

@@ -11,12 +11,12 @@ jobs:
     env:
       RUNGOGENERATE: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: "1.17.x"
+          go-version: "1.19.x"
       - name: Run repo-specific setup
         uses: ./.github/actions/go-check-setup
         if: hashFiles('./.github/actions/go-check-setup') != ''
@@ -27,7 +27,7 @@ jobs:
             echo "RUNGOGENERATE=true" >> $GITHUB_ENV
           fi
       - name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@c8caa92bad8c27ae734c6725b8a04932d54a147b # 2021.1.2 (v0.2.2)
+        run: go install honnef.co/go/tools/cmd/staticcheck@376210a89477dedbe6fdc4484b233998650d7b3c # 2022.1.3 (v0.3.3)
       - name: Check that go.mod is tidy
         uses: protocol/[email protected]
         with:
@@ -71,4 +71,3 @@ jobs:
               git status --short
               exit 1
             fi
-

.github/workflows/go-test.yml

@@ -10,16 +10,16 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu", "windows", "macos" ]
-        go: [ "1.16.x", "1.17.x" ]
+        go: [ "1.18.x", "1.19.x" ]
     env:
       COVERAGES: ""
-    runs-on: ${{ matrix.os }}-latest
-    name: ${{ matrix.os}} (go ${{ matrix.go }})
+    runs-on: ${{ format('{0}-latest', matrix.os) }}
+    name: ${{ matrix.os }} (go ${{ matrix.go }})
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
       - name: Go information
@@ -43,14 +43,16 @@ jobs:
           # Use -coverpkg=./..., so that we include cross-package coverage.
           # If package ./A imports ./B, and ./A's tests also cover ./B,
           # this means ./B's coverage will be significantly higher than 0%.
-          run: go test -v -coverprofile=module-coverage.txt -coverpkg=./... ./...
+          run: go test -v -shuffle=on -coverprofile=module-coverage.txt -coverpkg=./... ./...
       - name: Run tests (32 bit)
         if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX.
         uses: protocol/[email protected]
         env:
           GOARCH: 386
         with:
-          run: go test -v ./...
+          run: |
+            export "PATH=${{ env.PATH_386 }}:$PATH"
+            go test -v -shuffle=on ./...
       - name: Run tests with race detector
         if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow
         uses: protocol/[email protected]
@@ -60,7 +62,7 @@ jobs:
         shell: bash
         run: echo "COVERAGES=$(find . -type f -name 'module-coverage.txt' | tr -s '\n' ',' | sed 's/,$//')" >> $GITHUB_ENV
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
+        uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
         with:
           files: '${{ env.COVERAGES }}'
           env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}

README.md

@@ -51,8 +51,8 @@ If your existing library (i.e. `go-ipfs` or `go-filecoin`) uses these other olde
 
 ```golang
 import (
-  graphsync "github.com/ipfs/go-graphsync/impl"
-  gsnet "github.com/ipfs/go-graphsync/network"
+  graphsync "github.com/filecoin-project/boost-graphsync/impl"
+  gsnet "github.com/filecoin-project/boost-graphsync/network"
   ipld "github.com/ipld/go-ipld-prime"
 )
 
@@ -78,9 +78,9 @@ integrating with BlockStore's from IPFS.
 
 ```golang
 import (
-  graphsync "github.com/ipfs/go-graphsync/impl"
-  gsnet "github.com/ipfs/go-graphsync/network"
-  storeutil "github.com/ipfs/go-graphsync/storeutil"
+  graphsync "github.com/filecoin-project/boost-graphsync/impl"
+  gsnet "github.com/filecoin-project/boost-graphsync/network"
+  storeutil "github.com/filecoin-project/boost-graphsync/storeutil"
   ipld "github.com/ipld/go-ipld-prime"
   blockstore "github.com/ipfs/go-ipfs-blockstore"
 )

allocator/allocator.go

@@ -6,9 +6,9 @@ import (
 
 	pq "github.com/ipfs/go-ipfs-pq"
 	logging "github.com/ipfs/go-log/v2"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 
-	"github.com/ipfs/go-graphsync"
+	graphsync "github.com/filecoin-project/boost-graphsync"
 )
 
 var log = logging.Logger("graphsync_allocator")

allocator/allocator_test.go

@@ -3,12 +3,12 @@ package allocator_test
 import (
 	"testing"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/ipfs/go-graphsync/allocator"
-	"github.com/ipfs/go-graphsync/testutil"
+	"github.com/filecoin-project/boost-graphsync/allocator"
+	"github.com/filecoin-project/boost-graphsync/testutil"
 )
 
 func TestAllocator(t *testing.T) {

benchmarks/benchmark_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"runtime"
@@ -33,9 +32,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/ipfs/go-graphsync/benchmarks/testinstance"
-	tn "github.com/ipfs/go-graphsync/benchmarks/testnet"
-	graphsync "github.com/ipfs/go-graphsync/impl"
+	"github.com/filecoin-project/boost-graphsync/benchmarks/testinstance"
+	tn "github.com/filecoin-project/boost-graphsync/benchmarks/testnet"
+	graphsync "github.com/filecoin-project/boost-graphsync/impl"
 )
 
 type runStats struct {
@@ -337,15 +336,15 @@ var tempDirReplacer struct {
 // and modified as needed due to https://github.com/golang/go/issues/41062
 func newTempDirMaker(b *testing.B) (*tempDirMaker, error) {
 	c := &tempDirMaker{}
-	// ioutil.TempDir doesn't like path separators in its pattern,
+	// os.MkdirTemp doesn't like path separators in its pattern,
 	// so mangle the name to accommodate subtests.
 	tempDirReplacer.Do(func() {
 		tempDirReplacer.r = strings.NewReplacer("/", "_", "\\", "_", ":", "_")
 	})
 	pattern := tempDirReplacer.r.Replace(b.Name())
 
 	var err error
-	c.tdm, err = ioutil.TempDir("", pattern)
+	c.tdm, err = os.MkdirTemp("", pattern)
 	if err != nil {
 		return nil, err
 	}

benchmarks/testinstance/testinstance.go

@@ -11,15 +11,15 @@ import (
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	delay "github.com/ipfs/go-ipfs-delay"
 	"github.com/ipld/go-ipld-prime"
-	peer "github.com/libp2p/go-libp2p-core/peer"
-	p2ptestutil "github.com/libp2p/go-libp2p-netutil"
 	tnet "github.com/libp2p/go-libp2p-testing/net"
-
-	graphsync "github.com/ipfs/go-graphsync"
-	tn "github.com/ipfs/go-graphsync/benchmarks/testnet"
-	gsimpl "github.com/ipfs/go-graphsync/impl"
-	gsnet "github.com/ipfs/go-graphsync/network"
-	"github.com/ipfs/go-graphsync/storeutil"
+	p2ptestutil "github.com/libp2p/go-libp2p-testing/netutil"
+	peer "github.com/libp2p/go-libp2p/core/peer"
+
+	graphsync "github.com/filecoin-project/boost-graphsync"
+	tn "github.com/filecoin-project/boost-graphsync/benchmarks/testnet"
+	gsimpl "github.com/filecoin-project/boost-graphsync/impl"
+	gsnet "github.com/filecoin-project/boost-graphsync/network"
+	"github.com/filecoin-project/boost-graphsync/storeutil"
 )
 
 // TempDirGenerator is any interface that can generate temporary directories

benchmarks/testnet/interface.go

@@ -1,10 +1,10 @@
 package testnet
 
 import (
-	"github.com/libp2p/go-libp2p-core/peer"
 	tnet "github.com/libp2p/go-libp2p-testing/net"
+	"github.com/libp2p/go-libp2p/core/peer"
 
-	gsnet "github.com/ipfs/go-graphsync/network"
+	gsnet "github.com/filecoin-project/boost-graphsync/network"
 )
 
 // Network is an interface for generating graphsync network interfaces

benchmarks/testnet/internet_latency_delay_generator_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/ipfs/go-graphsync/benchmarks/testnet"
+	"github.com/filecoin-project/boost-graphsync/benchmarks/testnet"
 )
 
 const testSeed = 99

benchmarks/testnet/network_test.go

@@ -7,13 +7,13 @@ import (
 
 	blocks "github.com/ipfs/go-block-format"
 	delay "github.com/ipfs/go-ipfs-delay"
-	"github.com/libp2p/go-libp2p-core/peer"
 	tnet "github.com/libp2p/go-libp2p-testing/net"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/require"
 
-	"github.com/ipfs/go-graphsync/benchmarks/testnet"
-	gsmsg "github.com/ipfs/go-graphsync/message"
-	gsnet "github.com/ipfs/go-graphsync/network"
+	"github.com/filecoin-project/boost-graphsync/benchmarks/testnet"
+	gsmsg "github.com/filecoin-project/boost-graphsync/message"
+	gsnet "github.com/filecoin-project/boost-graphsync/network"
 )
 
 func TestSendMessageAsyncButWaitForResponse(t *testing.T) {

benchmarks/testnet/peernet.go

@@ -3,11 +3,11 @@ package testnet
 import (
 	"context"
 
-	"github.com/libp2p/go-libp2p-core/peer"
 	tnet "github.com/libp2p/go-libp2p-testing/net"
+	"github.com/libp2p/go-libp2p/core/peer"
 	mockpeernet "github.com/libp2p/go-libp2p/p2p/net/mock"
 
-	gsnet "github.com/ipfs/go-graphsync/network"
+	gsnet "github.com/filecoin-project/boost-graphsync/network"
 )
 
 type peernet struct {

benchmarks/testnet/virtual.go

@@ -9,15 +9,15 @@ import (
 
 	delay "github.com/ipfs/go-ipfs-delay"
 	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
-	"github.com/libp2p/go-libp2p-core/connmgr"
-	"github.com/libp2p/go-libp2p-core/peer"
 	tnet "github.com/libp2p/go-libp2p-testing/net"
+	"github.com/libp2p/go-libp2p/core/connmgr"
+	"github.com/libp2p/go-libp2p/core/peer"
 	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
 	"google.golang.org/protobuf/proto"
 
-	gsmsg "github.com/ipfs/go-graphsync/message"
-	gsmsgv1 "github.com/ipfs/go-graphsync/message/v1"
-	gsnet "github.com/ipfs/go-graphsync/network"
+	gsmsg "github.com/filecoin-project/boost-graphsync/message"
+	gsmsgv1 "github.com/filecoin-project/boost-graphsync/message/v1"
+	gsnet "github.com/filecoin-project/boost-graphsync/network"
 )
 
 // VirtualNetwork generates a new testnet instance - a fake network that

cidset/cidset_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/stretchr/testify/require"
 
-	"github.com/ipfs/go-graphsync/testutil"
+	"github.com/filecoin-project/boost-graphsync/testutil"
 )
 
 func TestDecodeEncodeCidSet(t *testing.T) {