Remove single-entry var blocks (#1589)
diff --git a/backoff.go b/backoff.go
index 090fbe8..c40facc 100644
--- a/backoff.go
+++ b/backoff.go
@@ -25,14 +25,12 @@
// DefaultBackoffConfig uses values specified for backoff in
// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
-var (
- DefaultBackoffConfig = BackoffConfig{
- MaxDelay: 120 * time.Second,
- baseDelay: 1.0 * time.Second,
- factor: 1.6,
- jitter: 0.2,
- }
-)
+var DefaultBackoffConfig = BackoffConfig{
+ MaxDelay: 120 * time.Second,
+ baseDelay: 1.0 * time.Second,
+ factor: 1.6,
+ jitter: 0.2,
+}
// backoffStrategy defines the methodology for backing off after a grpc
// connection failure.
diff --git a/benchmark/server/main.go b/benchmark/server/main.go
index dcce130..ac59ff7 100644
--- a/benchmark/server/main.go
+++ b/benchmark/server/main.go
@@ -30,9 +30,7 @@
"google.golang.org/grpc/grpclog"
)
-var (
- duration = flag.Int("duration", math.MaxInt32, "The duration in seconds to run the benchmark server")
-)
+var duration = flag.Int("duration", math.MaxInt32, "The duration in seconds to run the benchmark server")
func main() {
flag.Parse()
diff --git a/benchmark/worker/benchmark_client.go b/benchmark/worker/benchmark_client.go
index 9db1d85..072ceee 100644
--- a/benchmark/worker/benchmark_client.go
+++ b/benchmark/worker/benchmark_client.go
@@ -37,9 +37,7 @@
"google.golang.org/grpc/testdata"
)
-var (
- caFile = flag.String("ca_file", "", "The file containing the CA root cert file")
-)
+var caFile = flag.String("ca_file", "", "The file containing the CA root cert file")
type lockingHistogram struct {
mu sync.Mutex
diff --git a/codec.go b/codec.go
index 905b048..b452a4a 100644
--- a/codec.go
+++ b/codec.go
@@ -92,13 +92,11 @@
return "proto"
}
-var (
- protoBufferPool = &sync.Pool{
- New: func() interface{} {
- return &cachedProtoBuffer{
- Buffer: proto.Buffer{},
- lastMarshaledSize: 16,
- }
- },
- }
-)
+var protoBufferPool = &sync.Pool{
+ New: func() interface{} {
+ return &cachedProtoBuffer{
+ Buffer: proto.Buffer{},
+ lastMarshaledSize: 16,
+ }
+ },
+}
diff --git a/credentials/credentials.go b/credentials/credentials.go
index 2475fe8..c6575b5 100644
--- a/credentials/credentials.go
+++ b/credentials/credentials.go
@@ -34,10 +34,8 @@
"golang.org/x/net/context"
)
-var (
- // alpnProtoStr are the specified application level protocols for gRPC.
- alpnProtoStr = []string{"h2"}
-)
+// alpnProtoStr are the specified application level protocols for gRPC.
+var alpnProtoStr = []string{"h2"}
// PerRPCCredentials defines the common interface for the credentials which need to
// attach security information to every RPC (e.g., oauth2).
@@ -74,11 +72,9 @@
AuthType() string
}
-var (
- // ErrConnDispatched indicates that rawConn has been dispatched out of gRPC
- // and the caller should not close rawConn.
- ErrConnDispatched = errors.New("credentials: rawConn is dispatched out of gRPC")
-)
+// ErrConnDispatched indicates that rawConn has been dispatched out of gRPC
+// and the caller should not close rawConn.
+var ErrConnDispatched = errors.New("credentials: rawConn is dispatched out of gRPC")
// TransportCredentials defines the common interface for all the live gRPC wire
// protocols and supported transport security protocols (e.g., TLS, SSL).
diff --git a/examples/route_guide/mock_routeguide/rg_mock_test.go b/examples/route_guide/mock_routeguide/rg_mock_test.go
index 8c6d63c..d084bd6 100644
--- a/examples/route_guide/mock_routeguide/rg_mock_test.go
+++ b/examples/route_guide/mock_routeguide/rg_mock_test.go
@@ -29,12 +29,10 @@
rgpb "google.golang.org/grpc/examples/route_guide/routeguide"
)
-var (
- msg = &rgpb.RouteNote{
- Location: &rgpb.Point{Latitude: 17, Longitude: 29},
- Message: "Taxi-cab",
- }
-)
+var msg = &rgpb.RouteNote{
+ Location: &rgpb.Point{Latitude: 17, Longitude: 29},
+ Message: "Taxi-cab",
+}
func TestRouteChat(t *testing.T) {
ctrl := gomock.NewController(t)
diff --git a/interop/test_utils.go b/interop/test_utils.go
index 119c872..c609b92 100644
--- a/interop/test_utils.go
+++ b/interop/test_utils.go
@@ -394,12 +394,10 @@
}
}
-var (
- testMetadata = metadata.MD{
- "key1": []string{"value1"},
- "key2": []string{"value2"},
- }
-)
+var testMetadata = metadata.MD{
+ "key1": []string{"value1"},
+ "key2": []string{"value2"},
+}
// DoCancelAfterBegin cancels the RPC after metadata has been sent but before payloads are sent.
func DoCancelAfterBegin(tc testpb.TestServiceClient, args ...grpc.CallOption) {
diff --git a/resolver/dns/dns_resolver.go b/resolver/dns/dns_resolver.go
index f31bbb6..a543a70 100644
--- a/resolver/dns/dns_resolver.go
+++ b/resolver/dns/dns_resolver.go
@@ -50,9 +50,7 @@
txtAttribute = "grpc_config="
)
-var (
- errMissingAddr = errors.New("missing address")
-)
+var errMissingAddr = errors.New("missing address")
// NewBuilder creates a dnsBuilder which is used to factory DNS resolvers.
func NewBuilder() resolver.Builder {
diff --git a/resolver/dns/dns_resolver_test.go b/resolver/dns/dns_resolver_test.go
index 5907911..41a9ecb 100644
--- a/resolver/dns/dns_resolver_test.go
+++ b/resolver/dns/dns_resolver_test.go
@@ -150,9 +150,8 @@
// resolver functionality, with scfs as the input and scs used for validation of
// the output. For scfs[3], it corresponds to empty service config, since there
// isn't a matched choice.
-var (
- scfs = []string{
- `[
+var scfs = []string{
+ `[
{
"clientLanguage": [
"CPP",
@@ -242,7 +241,7 @@
}
}
]`,
- `[
+ `[
{
"clientLanguage": [
"CPP",
@@ -335,7 +334,7 @@
}
}
]`,
- `[
+ `[
{
"clientLanguage": [
"CPP",
@@ -434,7 +433,7 @@
}
}
]`,
- `[
+ `[
{
"clientLanguage": [
"CPP",
@@ -489,13 +488,11 @@
}
}
]`,
- }
-)
+}
// scs contains an array of service config string in JSON format.
-var (
- scs = []string{
- `{
+var scs = []string{
+ `{
"methodConfig": [
{
"name": [
@@ -508,7 +505,7 @@
}
]
}`,
- `{
+ `{
"methodConfig": [
{
"name": [
@@ -524,7 +521,7 @@
}
]
}`,
- `{
+ `{
"loadBalancingPolicy": "round_robin",
"methodConfig": [
{
@@ -546,8 +543,7 @@
}
]
}`,
- }
-)
+}
// scLookupTbl is a set, which contains targets that have service config. Target
// not in this set should not have service config.
diff --git a/resolver/dns/go17_test.go b/resolver/dns/go17_test.go
index 07fdcb0..21eaa88 100644
--- a/resolver/dns/go17_test.go
+++ b/resolver/dns/go17_test.go
@@ -27,9 +27,7 @@
"golang.org/x/net/context"
)
-var (
- errForInvalidTarget = fmt.Errorf("invalid target address [2001:db8:a0b:12f0::1, error info: missing ']' in address [2001:db8:a0b:12f0::1:443")
-)
+var errForInvalidTarget = fmt.Errorf("invalid target address [2001:db8:a0b:12f0::1, error info: missing ']' in address [2001:db8:a0b:12f0::1:443")
func replaceNetFunc() func() {
oldLookupHost := lookupHost
diff --git a/resolver/dns/go18_test.go b/resolver/dns/go18_test.go
index 8e01670..b0149c8 100644
--- a/resolver/dns/go18_test.go
+++ b/resolver/dns/go18_test.go
@@ -26,9 +26,7 @@
"net"
)
-var (
- errForInvalidTarget = fmt.Errorf("invalid target address [2001:db8:a0b:12f0::1, error info: address [2001:db8:a0b:12f0::1:443: missing ']' in address")
-)
+var errForInvalidTarget = fmt.Errorf("invalid target address [2001:db8:a0b:12f0::1, error info: address [2001:db8:a0b:12f0::1:443: missing ']' in address")
func replaceNetFunc() func() {
oldLookupHost := lookupHost
diff --git a/server.go b/server.go
index 7c882db..5537fdf 100644
--- a/server.go
+++ b/server.go
@@ -418,11 +418,9 @@
return ret
}
-var (
- // ErrServerStopped indicates that the operation is now illegal because of
- // the server being stopped.
- ErrServerStopped = errors.New("grpc: the server has been stopped")
-)
+// ErrServerStopped indicates that the operation is now illegal because of
+// the server being stopped.
+var ErrServerStopped = errors.New("grpc: the server has been stopped")
func (s *Server) useTransportAuthenticator(rawConn net.Conn) (net.Conn, credentials.AuthInfo, error) {
if s.opts.creds == nil {
diff --git a/transport/bdp_estimator.go b/transport/bdp_estimator.go
index 8dd2ed4..63cd262 100644
--- a/transport/bdp_estimator.go
+++ b/transport/bdp_estimator.go
@@ -41,12 +41,9 @@
gamma = 2
)
-var (
- // Adding arbitrary data to ping so that its ack can be
- // identified.
- // Easter-egg: what does the ping message say?
- bdpPing = &ping{data: [8]byte{2, 4, 16, 16, 9, 14, 7, 7}}
-)
+// Adding arbitrary data to ping so that its ack can be identified.
+// Easter-egg: what does the ping message say?
+var bdpPing = &ping{data: [8]byte{2, 4, 16, 16, 9, 14, 7, 7}}
type bdpEstimator struct {
// sentAt is the time when the ping was sent.
