From 3ce75697d0483b678940efe63f8318f33a8290e1 Mon Sep 17 00:00:00 2001 From: wineandchord Date: Tue, 16 Apr 2024 10:28:39 +0800 Subject: [PATCH] go.mod: upgrade tnet version to handle negative idle timeout (#169) Fixes #165 --- examples/go.mod | 2 +- examples/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- test/go.mod | 2 +- test/go.sum | 4 ++-- transport/tnet/client_transport_test.go | 13 ------------- 7 files changed, 9 insertions(+), 22 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index ab9f708..18b4a5f 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -41,5 +41,5 @@ require ( golang.org/x/sys v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - trpc.group/trpc-go/tnet v1.0.0 // indirect + trpc.group/trpc-go/tnet v1.0.1 // indirect ) diff --git a/examples/go.sum b/examples/go.sum index e0d6081..21e4cf7 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -128,7 +128,7 @@ gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -trpc.group/trpc-go/tnet v1.0.0 h1:XsdA82/sOHLa4TFAlCZbb3xi4+Q92NNuxEMTj0UfFZ0= -trpc.group/trpc-go/tnet v1.0.0/go.mod h1:s/webUFYWEFBHErKyFmj7LYC7XfC2LTLCcwfSnJ04M0= +trpc.group/trpc-go/tnet v1.0.1 h1:Yzqyrgyfm+W742FzGr39c4+OeQmLi7PWotJxrOBtV9o= +trpc.group/trpc-go/tnet v1.0.1/go.mod h1:s/webUFYWEFBHErKyFmj7LYC7XfC2LTLCcwfSnJ04M0= trpc.group/trpc/trpc-protocol/pb/go/trpc v1.0.0 h1:rMtHYzI0ElMJRxHtT5cD99SigFE6XzKK4PFtjcwokI0= trpc.group/trpc/trpc-protocol/pb/go/trpc v1.0.0/go.mod h1:K+a1K/Gnlcg9BFHWx30vLBIEDhxODhl25gi1JjA54CQ= diff --git a/go.mod b/go.mod index c98e1c8..a610973 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( golang.org/x/sys v0.13.0 google.golang.org/protobuf v1.30.0 gopkg.in/yaml.v3 v3.0.1 - trpc.group/trpc-go/tnet v1.0.0 + trpc.group/trpc-go/tnet v1.0.1 trpc.group/trpc/trpc-protocol/pb/go/trpc v1.0.0 ) diff --git a/go.sum b/go.sum index 258b5d9..d251db4 100644 --- a/go.sum +++ b/go.sum @@ -137,7 +137,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -trpc.group/trpc-go/tnet v1.0.0 h1:XsdA82/sOHLa4TFAlCZbb3xi4+Q92NNuxEMTj0UfFZ0= -trpc.group/trpc-go/tnet v1.0.0/go.mod h1:s/webUFYWEFBHErKyFmj7LYC7XfC2LTLCcwfSnJ04M0= +trpc.group/trpc-go/tnet v1.0.1 h1:Yzqyrgyfm+W742FzGr39c4+OeQmLi7PWotJxrOBtV9o= +trpc.group/trpc-go/tnet v1.0.1/go.mod h1:s/webUFYWEFBHErKyFmj7LYC7XfC2LTLCcwfSnJ04M0= trpc.group/trpc/trpc-protocol/pb/go/trpc v1.0.0 h1:rMtHYzI0ElMJRxHtT5cD99SigFE6XzKK4PFtjcwokI0= trpc.group/trpc/trpc-protocol/pb/go/trpc v1.0.0/go.mod h1:K+a1K/Gnlcg9BFHWx30vLBIEDhxODhl25gi1JjA54CQ= diff --git a/test/go.mod b/test/go.mod index 632f2bb..f1075bb 100644 --- a/test/go.mod +++ b/test/go.mod @@ -43,5 +43,5 @@ require ( go.uber.org/multierr v1.10.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect - trpc.group/trpc-go/tnet v1.0.0 // indirect + trpc.group/trpc-go/tnet v1.0.1 // indirect ) diff --git a/test/go.sum b/test/go.sum index 2821134..4a0ce4c 100644 --- a/test/go.sum +++ b/test/go.sum @@ -125,7 +125,7 @@ gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -trpc.group/trpc-go/tnet v1.0.0 h1:XsdA82/sOHLa4TFAlCZbb3xi4+Q92NNuxEMTj0UfFZ0= -trpc.group/trpc-go/tnet v1.0.0/go.mod h1:s/webUFYWEFBHErKyFmj7LYC7XfC2LTLCcwfSnJ04M0= +trpc.group/trpc-go/tnet v1.0.1 h1:Yzqyrgyfm+W742FzGr39c4+OeQmLi7PWotJxrOBtV9o= +trpc.group/trpc-go/tnet v1.0.1/go.mod h1:s/webUFYWEFBHErKyFmj7LYC7XfC2LTLCcwfSnJ04M0= trpc.group/trpc/trpc-protocol/pb/go/trpc v1.0.0 h1:rMtHYzI0ElMJRxHtT5cD99SigFE6XzKK4PFtjcwokI0= trpc.group/trpc/trpc-protocol/pb/go/trpc v1.0.0/go.mod h1:K+a1K/Gnlcg9BFHWx30vLBIEDhxODhl25gi1JjA54CQ= diff --git a/transport/tnet/client_transport_test.go b/transport/tnet/client_transport_test.go index 503e3f9..e3b807b 100644 --- a/transport/tnet/client_transport_test.go +++ b/transport/tnet/client_transport_test.go @@ -50,19 +50,6 @@ func TestDial(t *testing.T) { return assert.Contains(t, err.Error(), "unknown network") }, }, - { - name: "invalid idle timeout", - opts: &connpool.DialOptions{ - CACertFile: "", - Network: "tcp", - Address: l.Addr().String(), - IdleTimeout: -1, - }, - want: nil, - wantErr: func(t assert.TestingT, err error, msg ...interface{}) bool { - return assert.Contains(t, err.Error(), "delay time is too short") - }, - }, { name: "wrong CACertFile and TLSServerName ", opts: &connpool.DialOptions{