deps: upgrade storj.io/common

In addition to upgrading the storj.io/common library, this change moves off the TCPConnector in favor of the HybridConnector per the deprecation warning. Change-Id: I7e7e1e7568e8b95e4a99ad9caa158a799e68e1e3
storj · Feb 16, 2022 · 05a17ef · 05a17ef
1 parent 62eeb59
commit 05a17ef
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 23 deletions.
diff --git a/cmd/connect-test/connecttest.go b/cmd/connect-test/connecttest.go
@@ -54,7 +54,11 @@ func main() {
 		return nil
 	})
 	group.Go(func() error {
-		tcpNodeID, tcpErr = tryConnect(ctx, unverifiedClientConfig, rpc.NewDefaultTCPConnector(nil), destAddr)
+		//lint:ignore SA1019 deprecated is fine here.
+		//nolint:staticcheck // deprecated is fine here.
+		connector := rpc.NewDefaultTCPConnector(nil)
+
+		tcpNodeID, tcpErr = tryConnect(ctx, unverifiedClientConfig, connector, destAddr)
 		return nil
 	})
 	err = group.Wait()

diff --git a/go.mod b/go.mod
@@ -48,11 +48,11 @@ 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.0-20200313102051-9f266ea9e77c
-	storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b
+	storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb
 	storj.io/drpc v0.0.29
 	storj.io/monkit-jaeger v0.0.0-20220131130547-dc4cb5a0d97a
 	storj.io/private v0.0.0-20220131131751-c913260b9ec2
-	storj.io/uplink v1.7.2-0.20220203120550-299484e42318
+	storj.io/uplink v1.7.2-0.20220216123701-9e00d72711dc
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -846,13 +846,14 @@ 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-20220131120956-e74f624a3d55/go.mod h1:m0489td5+rKDdoiYOzCkh3CfGW/cLyntZiYfso+QfMs=
-storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b h1:9+egWAMDv0vEoKmERP+NYEM3Mtmn/dV34Orj58czbls=
 storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b/go.mod h1:xW3PPPGBo4bdMtEP9GREnmxQptmJNuDg1tEHcA4zqog=
+storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb h1:FljLFBKn1qBrdwKaR0k5U4GhXfA/BUWVd9VuhvEFRpM=
+storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb/go.mod h1:xW3PPPGBo4bdMtEP9GREnmxQptmJNuDg1tEHcA4zqog=
 storj.io/drpc v0.0.29 h1:Ihd4ls/JQFr0lctefie3iu+3QM4duccCKr9uMzf4sKY=
 storj.io/drpc v0.0.29/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
 storj.io/monkit-jaeger v0.0.0-20220131130547-dc4cb5a0d97a h1:qads+aZlFKm5gUxobfF9s2x8/byPaPPLe2Mz+J82R+k=
 storj.io/monkit-jaeger v0.0.0-20220131130547-dc4cb5a0d97a/go.mod h1:DGEycSjvzE0JqcD3+6IjwPEK6x30oOus6AApXzl7t0s=
 storj.io/private v0.0.0-20220131131751-c913260b9ec2 h1:POHeqNfH0YzO4d2px9NZRPvWPumvA3581YPK2nwP7gw=
 storj.io/private v0.0.0-20220131131751-c913260b9ec2/go.mod h1:i08plLYNEyxf9eObj0UAYnTyh+6r8jvra4JDnvhFsCI=
-storj.io/uplink v1.7.2-0.20220203120550-299484e42318 h1:S1d4kB6XcOjD+gvZSNKvepWC/dHvQng/LLa/WLd7XFI=
-storj.io/uplink v1.7.2-0.20220203120550-299484e42318/go.mod h1:9Mnv30HQvazLU4fh/hzhbrlQb9PkXqE3qDJfOUoP49A=
+storj.io/uplink v1.7.2-0.20220216123701-9e00d72711dc h1:VI2YHH1h7FE24Ob/B+lwvRcn5r7xsZk+ZcGpb0UPCqA=
+storj.io/uplink v1.7.2-0.20220216123701-9e00d72711dc/go.mod h1:9Mnv30HQvazLU4fh/hzhbrlQb9PkXqE3qDJfOUoP49A=
diff --git a/satellite/audit/reverify_test.go b/satellite/audit/reverify_test.go
@@ -383,8 +383,8 @@ func TestReverifyOfflineDialTimeout(t *testing.T) {
 		dialer.DialTimeout = 20 * time.Millisecond
 		dialer.DialLatency = 200 * time.Second
 
-		connector := rpc.NewDefaultTCPConnector(nil)
-		connector.TransferRate = 1 * memory.KB
+		connector := rpc.NewHybridConnector()
+		connector.SetTransferRate(1 * memory.KB)
 		dialer.Connector = connector
 
 		// This config value will create a very short timeframe allowed for receiving

diff --git a/satellite/audit/verifier_test.go b/satellite/audit/verifier_test.go
@@ -240,8 +240,8 @@ func TestDownloadSharesDialTimeout(t *testing.T) {
 		dialer.DialTimeout = 20 * time.Millisecond
 		dialer.DialLatency = 200 * time.Second
 
-		connector := rpc.NewDefaultTCPConnector(nil)
-		connector.TransferRate = 1 * memory.KB
+		connector := rpc.NewHybridConnector()
+		connector.SetTransferRate(1 * memory.KB)
 		dialer.Connector = connector
 
 		// This config value will create a very short timeframe allowed for receiving
@@ -616,8 +616,8 @@ func TestVerifierDialTimeout(t *testing.T) {
 		dialer.DialTimeout = 20 * time.Millisecond
 		dialer.DialLatency = 200 * time.Second
 
-		connector := rpc.NewDefaultTCPConnector(nil)
-		connector.TransferRate = 1 * memory.KB
+		connector := rpc.NewHybridConnector()
+		connector.SetTransferRate(1 * memory.KB)
 		dialer.Connector = connector
 
 		// This config value will create a very short timeframe allowed for receiving

diff --git a/satellite/core.go b/satellite/core.go
@@ -303,13 +303,20 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB,
 	}
 
 	{ // setup audit
+		// force tcp for now because audit is very sensitive to how errors
+		// are returned, and adding quic can cause problems
+		dialer := peer.Dialer
+		//lint:ignore SA1019 deprecated is fine here.
+		//nolint:staticcheck // deprecated is fine here.
+		dialer.Connector = rpc.NewDefaultTCPConnector(nil)
+
 		config := config.Audit
 
 		peer.Audit.Queues = audit.NewQueues()
 
 		peer.Audit.Verifier = audit.NewVerifier(log.Named("audit:verifier"),
 			peer.Metainfo.Metabase,
-			peer.Dialer,
+			dialer,
 			peer.Overlay.Service,
 			peer.DB.Containment(),
 			peer.Orders.Service,

diff --git a/testsuite/go.mod b/testsuite/go.mod
@@ -10,10 +10,10 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	go.uber.org/zap v1.17.0
-	storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b
+	storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb
 	storj.io/gateway-mt v1.18.1-0.20211210081136-cada9a567d31
 	storj.io/private v0.0.0-20220131131751-c913260b9ec2
-	storj.io/storj v0.12.1-0.20211102170500-1de8a695e84a
+	storj.io/storj v0.12.1-0.20220216152726-b24379aa917a
 )
 
 require (
@@ -179,9 +179,7 @@ require (
 	github.com/ysmood/gson v0.6.4 // indirect
 	github.com/ysmood/leakless v0.7.0 // indirect
 	github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb // indirect
-	github.com/zeebo/clingy v0.0.0-20220125233608-1457d47c8d8d // indirect
 	github.com/zeebo/errs v1.2.2 // indirect
-	github.com/zeebo/errs/v2 v2.0.3 // indirect
 	go.etcd.io/bbolt v1.3.5 // indirect
 	go.etcd.io/etcd v0.0.0-20201125193152-8a03d2e9614b // indirect
 	go.opentelemetry.io/otel v0.18.0 // indirect
@@ -220,5 +218,5 @@ require (
 	storj.io/gateway v1.4.1 // indirect
 	storj.io/minio v0.0.0-20211007171754-df6c27823c8a // indirect
 	storj.io/monkit-jaeger v0.0.0-20220131130547-dc4cb5a0d97a // indirect
-	storj.io/uplink v1.7.2-0.20220203120550-299484e42318 // indirect
+	storj.io/uplink v1.7.2-0.20220216123701-9e00d72711dc // indirect
 )
diff --git a/testsuite/go.sum b/testsuite/go.sum
@@ -950,12 +950,10 @@ github.com/zeebo/assert v0.0.0-20181109011804-10f827ce2ed6/go.mod h1:yssERNPivll
 github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
-github.com/zeebo/clingy v0.0.0-20220125233608-1457d47c8d8d h1:UaVtVecb8eS/OUZAy9T4PW4RGWA4LpgWxWRrpgFZ7V0=
 github.com/zeebo/clingy v0.0.0-20220125233608-1457d47c8d8d/go.mod h1:MHEhXvEfewflU7SSVKHI7nkdU+fpyxZ5XPPzj+5gYNw=
 github.com/zeebo/errs v1.1.1/go.mod h1:Yj8dHrUQwls1bF3dr/vcSIu+qf4mI7idnTcHfoACc6I=
 github.com/zeebo/errs v1.2.2 h1:5NFypMTuSdoySVTqlNs1dEoU21QVamMQJxW/Fii5O7g=
 github.com/zeebo/errs v1.2.2/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
-github.com/zeebo/errs/v2 v2.0.3 h1:WwqAmopgot4ZC+CgIveP+H91Nf78NDEGWjtAXen45Hw=
 github.com/zeebo/errs/v2 v2.0.3/go.mod h1:OKmvVZt4UqpyJrYFykDKm168ZquJ55pbbIVUICNmLN0=
 github.com/zeebo/float16 v0.1.0/go.mod h1:fssGvvXu+XS8MH57cKmyrLB/cqioYeYX/2mXCN3a5wo=
 github.com/zeebo/incenc v0.0.0-20180505221441-0d92902eec54/go.mod h1:EI8LcOBDlSL3POyqwC1eJhOYlMBMidES+613EtmmT5w=
@@ -1397,8 +1395,9 @@ storj.io/common v0.0.0-20210805073808-8e0feb09e92a/go.mod h1:mhZYWpTojKsACxWE66R
 storj.io/common v0.0.0-20210916151047-6aaeb34bb916/go.mod h1:objobGrIWQwhmTSpSm6Y7ykd40wZjB7CezNfic5YLKg=
 storj.io/common v0.0.0-20211102144601-401a79f0706a/go.mod h1:a2Kw7Uipu929OFANfWKLHRoD0JfhgssikEvimd6hbSQ=
 storj.io/common v0.0.0-20220131120956-e74f624a3d55/go.mod h1:m0489td5+rKDdoiYOzCkh3CfGW/cLyntZiYfso+QfMs=
-storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b h1:9+egWAMDv0vEoKmERP+NYEM3Mtmn/dV34Orj58czbls=
 storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b/go.mod h1:xW3PPPGBo4bdMtEP9GREnmxQptmJNuDg1tEHcA4zqog=
+storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb h1:FljLFBKn1qBrdwKaR0k5U4GhXfA/BUWVd9VuhvEFRpM=
+storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb/go.mod h1:xW3PPPGBo4bdMtEP9GREnmxQptmJNuDg1tEHcA4zqog=
 storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840/go.mod h1:KU9YvEgRrMMiWLvH8pzn1UkoCoxggKIPvQxmNdx7aXQ=
 storj.io/drpc v0.0.11/go.mod h1:TiFc2obNjL9/3isMW1Rpxjy8V9uE0B2HMeMFGiiI7Iw=
 storj.io/drpc v0.0.24/go.mod h1:ofQUDPQbbIymRDKE0tms48k8bLP5Y+dsI9CbXGv3gko=
@@ -1419,5 +1418,5 @@ storj.io/private v0.0.0-20220131131751-c913260b9ec2 h1:POHeqNfH0YzO4d2px9NZRPvWP
 storj.io/private v0.0.0-20220131131751-c913260b9ec2/go.mod h1:i08plLYNEyxf9eObj0UAYnTyh+6r8jvra4JDnvhFsCI=
 storj.io/uplink v1.7.0/go.mod h1:zqj/LFDxa6RMaSRSHOmukg3mMgesOry0iHSjNldDMGo=
 storj.io/uplink v1.7.1-0.20211103104100-a785482780d8/go.mod h1:pKqsMpNMIAz//2TXzUGOR6tpu3iyabvXV4VWINj4jaY=
-storj.io/uplink v1.7.2-0.20220203120550-299484e42318 h1:S1d4kB6XcOjD+gvZSNKvepWC/dHvQng/LLa/WLd7XFI=
-storj.io/uplink v1.7.2-0.20220203120550-299484e42318/go.mod h1:9Mnv30HQvazLU4fh/hzhbrlQb9PkXqE3qDJfOUoP49A=
+storj.io/uplink v1.7.2-0.20220216123701-9e00d72711dc h1:VI2YHH1h7FE24Ob/B+lwvRcn5r7xsZk+ZcGpb0UPCqA=
+storj.io/uplink v1.7.2-0.20220216123701-9e00d72711dc/go.mod h1:9Mnv30HQvazLU4fh/hzhbrlQb9PkXqE3qDJfOUoP49A=