From 36038af3d1d034cf04d42405d022655515970088 Mon Sep 17 00:00:00 2001 From: JT Olio Date: Thu, 18 May 2023 10:19:55 -0400 Subject: [PATCH] go.mod: bump storj.io/common Change-Id: I18d4d491cdca99f6694a20f3ead5fba3f75bb658 --- go.mod | 2 +- go.sum | 4 ++-- satellite/audit/verifier_test.go | 6 +++++- testsuite/storjscan/go.mod | 2 +- testsuite/storjscan/go.sum | 4 ++-- testsuite/ui/go.mod | 2 +- testsuite/ui/go.sum | 4 ++-- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 073d0d7df..210621368 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e gopkg.in/segmentio/analytics-go.v3 v3.1.0 gopkg.in/yaml.v3 v3.0.1 - storj.io/common v0.0.0-20230504204616-8b62322ba410 + storj.io/common v0.0.0-20230601153104-60cf9949f4d8 storj.io/drpc v0.0.33 storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8 diff --git a/go.sum b/go.sum index 91df8d9af..f095498ad 100644 --- a/go.sum +++ b/go.sum @@ -974,8 +974,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ= -storj.io/common v0.0.0-20230504204616-8b62322ba410 h1:P4wWUrAx86rL7xbdvc3jj8ExnBGWtKYD1hDLkEzDwsE= -storj.io/common v0.0.0-20230504204616-8b62322ba410/go.mod h1:j5YdcshmpJL+oW1+3IyBnCsv/HGbFkbzNDtuZg24KF0= +storj.io/common v0.0.0-20230601153104-60cf9949f4d8 h1:yFub07+JYRABMEthmgUttCdtnYiB1ZDXBF8mOMBONnQ= +storj.io/common v0.0.0-20230601153104-60cf9949f4d8/go.mod h1:zu2L8WdpvfIBrCbBTgPsz4qhHSArYSiDgRcV1RLlIF8= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.33 h1:yCGZ26r66ZdMP0IcTYsj7WDAUIIjzXk6DJhbhvt9FHI= storj.io/drpc v0.0.33/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4= diff --git a/satellite/audit/verifier_test.go b/satellite/audit/verifier_test.go index 9c56683ce..17caaf4fe 100644 --- a/satellite/audit/verifier_test.go +++ b/satellite/audit/verifier_test.go @@ -6,7 +6,9 @@ package audit_test import ( "context" "crypto/rand" + "errors" "fmt" + "io" "net" "os" "syscall" @@ -372,7 +374,9 @@ func TestDownloadSharesDialIOTimeout(t *testing.T) { for { _, err = conn.Read(buf) if err != nil { - assert.ErrorIs(t, err, syscall.ECONNRESET) + if !errors.Is(err, syscall.ECONNRESET) && !errors.Is(err, io.EOF) { + t.Fatalf("expected econnreset or eof, got %q", err.Error()) + } return nil } } diff --git a/testsuite/storjscan/go.mod b/testsuite/storjscan/go.mod index 337921e51..558405196 100644 --- a/testsuite/storjscan/go.mod +++ b/testsuite/storjscan/go.mod @@ -9,7 +9,7 @@ require ( github.com/zeebo/errs v1.3.0 go.uber.org/zap v1.21.0 golang.org/x/sync v0.1.0 - storj.io/common v0.0.0-20230504204616-8b62322ba410 + storj.io/common v0.0.0-20230601153104-60cf9949f4d8 storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8 storj.io/storj v1.63.1 storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 diff --git a/testsuite/storjscan/go.sum b/testsuite/storjscan/go.sum index 781a7c0d3..8ef6380cd 100644 --- a/testsuite/storjscan/go.sum +++ b/testsuite/storjscan/go.sum @@ -1239,8 +1239,8 @@ rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ= -storj.io/common v0.0.0-20230504204616-8b62322ba410 h1:P4wWUrAx86rL7xbdvc3jj8ExnBGWtKYD1hDLkEzDwsE= -storj.io/common v0.0.0-20230504204616-8b62322ba410/go.mod h1:j5YdcshmpJL+oW1+3IyBnCsv/HGbFkbzNDtuZg24KF0= +storj.io/common v0.0.0-20230601153104-60cf9949f4d8 h1:yFub07+JYRABMEthmgUttCdtnYiB1ZDXBF8mOMBONnQ= +storj.io/common v0.0.0-20230601153104-60cf9949f4d8/go.mod h1:zu2L8WdpvfIBrCbBTgPsz4qhHSArYSiDgRcV1RLlIF8= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.33 h1:yCGZ26r66ZdMP0IcTYsj7WDAUIIjzXk6DJhbhvt9FHI= storj.io/drpc v0.0.33/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4= diff --git a/testsuite/ui/go.mod b/testsuite/ui/go.mod index 01fd89731..7e2a170b3 100644 --- a/testsuite/ui/go.mod +++ b/testsuite/ui/go.mod @@ -10,7 +10,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.2 go.uber.org/zap v1.23.0 - storj.io/common v0.0.0-20230504204616-8b62322ba410 + storj.io/common v0.0.0-20230601153104-60cf9949f4d8 storj.io/gateway-mt v1.51.1-0.20230417204402-7d9bb25bc297 storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8 storj.io/storj v0.12.1-0.20221125175451-ef4b564b82f7 diff --git a/testsuite/ui/go.sum b/testsuite/ui/go.sum index 7cadba6c6..f3389741c 100644 --- a/testsuite/ui/go.sum +++ b/testsuite/ui/go.sum @@ -1943,8 +1943,8 @@ sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ= -storj.io/common v0.0.0-20230504204616-8b62322ba410 h1:P4wWUrAx86rL7xbdvc3jj8ExnBGWtKYD1hDLkEzDwsE= -storj.io/common v0.0.0-20230504204616-8b62322ba410/go.mod h1:j5YdcshmpJL+oW1+3IyBnCsv/HGbFkbzNDtuZg24KF0= +storj.io/common v0.0.0-20230601153104-60cf9949f4d8 h1:yFub07+JYRABMEthmgUttCdtnYiB1ZDXBF8mOMBONnQ= +storj.io/common v0.0.0-20230601153104-60cf9949f4d8/go.mod h1:zu2L8WdpvfIBrCbBTgPsz4qhHSArYSiDgRcV1RLlIF8= storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840 h1:oqMwoF6vaOrCe92SKRyr8cc2WSjLYAd8fjpAHA7rNqY= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.33 h1:yCGZ26r66ZdMP0IcTYsj7WDAUIIjzXk6DJhbhvt9FHI=