update v0.13.x deps

.github/workflows/automerge.yml

@@ -1,53 +1,11 @@
 # File managed by web3-bot. DO NOT EDIT.
 # See https:/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 }}

allocator/allocator.go

@@ -6,7 +6,7 @@ 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"
 )

allocator/allocator_test.go

@@ -3,7 +3,7 @@ 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"
 

benchmarks/benchmark_test.go

@@ -4,7 +4,6 @@ import (
  "bytes"
  "context"
  "fmt"
- "io/ioutil"
  "math/rand"
  "os"
  "runtime"
@@ -337,15 +336,15 @@ var tempDirReplacer struct {
 // and modified as needed due to https:/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,9 +11,9 @@ 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"
+ p2ptestutil "github.com/libp2p/go-libp2p-testing/netutil"
+ peer "github.com/libp2p/go-libp2p/core/peer"
 
  graphsync "github.com/ipfs/go-graphsync"
  tn "github.com/ipfs/go-graphsync/benchmarks/testnet"

benchmarks/testnet/interface.go

@@ -1,8 +1,8 @@
 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"
 )

benchmarks/testnet/network_test.go

@@ -7,8 +7,8 @@ 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"

benchmarks/testnet/peernet.go

@@ -3,8 +3,8 @@ 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"

benchmarks/testnet/virtual.go

@@ -9,9 +9,9 @@ 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"
 

go.mod

@@ -1,16 +1,16 @@
 module github.com/ipfs/go-graphsync
 
-go 1.16
+go 1.18
 
 require (
- github.com/google/go-cmp v0.5.8
+ github.com/google/go-cmp v0.5.9
  github.com/google/uuid v1.3.0
  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-blockservice v0.2.1
- github.com/ipfs/go-cid v0.2.0
- github.com/ipfs/go-datastore v0.5.1
+ github.com/ipfs/go-cid v0.3.2
+ github.com/ipfs/go-datastore v0.6.0
  github.com/ipfs/go-ds-badger v0.3.0
  github.com/ipfs/go-ipfs-blockstore v1.1.2
  github.com/ipfs/go-ipfs-blocksutil v0.0.1
@@ -19,29 +19,106 @@ require (
  github.com/ipfs/go-ipfs-exchange-offline v0.1.1
  github.com/ipfs/go-ipfs-files v0.0.8
  github.com/ipfs/go-ipfs-pq v0.0.2
- github.com/ipfs/go-ipfs-routing v0.2.1
+ github.com/ipfs/go-ipfs-routing v0.3.0
  github.com/ipfs/go-ipfs-util v0.0.2
  github.com/ipfs/go-ipld-format v0.2.0
  github.com/ipfs/go-log/v2 v2.5.1
  github.com/ipfs/go-merkledag v0.5.1
- github.com/ipfs/go-peertaskqueue v0.7.1
- github.com/ipfs/go-unixfs v0.3.1
- github.com/ipfs/go-unixfsnode v1.4.0
- github.com/ipld/go-codec-dagpb v1.3.1
- github.com/ipld/go-ipld-prime v0.17.0
+ github.com/ipfs/go-peertaskqueue v0.8.0
+ github.com/ipfs/go-unixfs v0.4.3
+ github.com/ipfs/go-unixfsnode v1.5.2
+ github.com/ipld/go-codec-dagpb v1.5.0
+ github.com/ipld/go-ipld-prime v0.20.0
  github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
- github.com/libp2p/go-buffer-pool v0.0.2
- github.com/libp2p/go-libp2p v0.19.4
- github.com/libp2p/go-libp2p-core v0.15.1
- github.com/libp2p/go-libp2p-netutil v0.1.0
- github.com/libp2p/go-libp2p-testing v0.9.2
- github.com/libp2p/go-msgio v0.2.0
- github.com/multiformats/go-multiaddr v0.5.0
- github.com/multiformats/go-multihash v0.1.0
- github.com/stretchr/testify v1.7.0
+ github.com/libp2p/go-buffer-pool v0.1.0
+ github.com/libp2p/go-libp2p v0.25.0
+ github.com/libp2p/go-libp2p-testing v0.12.0
+ github.com/libp2p/go-msgio v0.3.0
+ github.com/multiformats/go-multiaddr v0.8.0
+ github.com/multiformats/go-multihash v0.2.1
+ github.com/stretchr/testify v1.8.1
  go.opentelemetry.io/otel v1.2.0
  go.opentelemetry.io/otel/sdk v1.2.0
  go.opentelemetry.io/otel/trace v1.2.0
- golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
- google.golang.org/protobuf v1.28.0
+ golang.org/x/sync v0.1.0
+ google.golang.org/protobuf v1.28.1
+)
+
+require (
+ github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
+ github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
+ github.com/benbjohnson/clock v1.3.0 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/cespare/xxhash v1.1.0 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+ github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+ github.com/dgraph-io/badger v1.6.2 // indirect
+ github.com/dgraph-io/ristretto v0.0.2 // indirect
+ github.com/dustin/go-humanize v1.0.0 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/golang/protobuf v1.5.2 // indirect
+ github.com/google/gopacket v1.1.19 // indirect
+ github.com/hashicorp/golang-lru v0.5.4 // indirect
+ github.com/huin/goupnp v1.0.3 // indirect
+ github.com/ipfs/bbloom v0.0.4 // indirect
+ github.com/ipfs/go-bitfield v1.1.0 // indirect
+ github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
+ github.com/ipfs/go-ipfs-exchange-interface v0.1.0 // indirect
+ github.com/ipfs/go-ipfs-posinfo v0.0.1 // indirect
+ github.com/ipfs/go-ipld-cbor v0.0.5 // indirect
+ github.com/ipfs/go-ipld-legacy v0.1.0 // indirect
+ github.com/ipfs/go-libipfs v0.1.0 // indirect
+ github.com/ipfs/go-log v1.0.5 // indirect
+ github.com/ipfs/go-metrics-interface v0.0.1 // indirect
+ github.com/ipfs/go-verifcid v0.0.1 // indirect
+ github.com/jackpal/go-nat-pmp v1.0.2 // indirect
+ github.com/jbenet/goprocess v0.1.4 // indirect
+ github.com/klauspost/cpuid/v2 v2.2.1 // indirect
+ github.com/koron/go-ssdp v0.0.3 // indirect
+ github.com/libp2p/go-cidranger v1.1.0 // indirect
+ github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
+ github.com/libp2p/go-libp2p-record v0.2.0 // indirect
+ github.com/libp2p/go-nat v0.1.0 // indirect
+ github.com/libp2p/go-netroute v0.2.1 // indirect
+ github.com/mattn/go-isatty v0.0.16 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+ github.com/miekg/dns v1.1.50 // indirect
+ github.com/minio/sha256-simd v1.0.0 // indirect
+ github.com/mr-tron/base58 v1.2.0 // indirect
+ github.com/multiformats/go-base32 v0.1.0 // indirect
+ github.com/multiformats/go-base36 v0.2.0 // indirect
+ github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
+ github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
+ github.com/multiformats/go-multibase v0.1.1 // indirect
+ github.com/multiformats/go-multicodec v0.8.0 // indirect
+ github.com/multiformats/go-multistream v0.4.0 // indirect
+ github.com/multiformats/go-varint v0.0.7 // indirect
+ github.com/opentracing/opentracing-go v1.2.0 // indirect
+ github.com/pkg/errors v0.9.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
+ github.com/prometheus/client_golang v1.14.0 // indirect
+ github.com/prometheus/client_model v0.3.0 // indirect
+ github.com/prometheus/common v0.37.0 // indirect
+ github.com/prometheus/procfs v0.8.0 // indirect
+ github.com/russross/blackfriday/v2 v2.0.1 // indirect
+ github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+ github.com/spaolacci/murmur3 v1.1.0 // indirect
+ github.com/urfave/cli/v2 v2.0.0 // indirect
+ github.com/whyrusleeping/cbor-gen v0.0.0-20200710004633-5379fc63235d // indirect
+ github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
+ go.uber.org/atomic v1.10.0 // indirect
+ go.uber.org/multierr v1.8.0 // indirect
+ go.uber.org/zap v1.24.0 // indirect
+ golang.org/x/crypto v0.4.0 // indirect
+ golang.org/x/mod v0.7.0 // indirect
+ golang.org/x/net v0.4.0 // indirect
+ golang.org/x/sys v0.3.0 // indirect
+ golang.org/x/tools v0.3.0 // indirect
+ golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
+ lukechampine.com/blake3 v1.1.7 // indirect
 )