opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove single-entry var blocks (#1589)

Browse Source
This commit is contained in:
田欧
2017-10-18 11:59:23 -05:00
committed by dfawley
parent 16c41925b8
commit faebfcb7bf
13 changed files with 49 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backoff.go
View File

@ -25,14 +25,12 @@ import (
// 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.

4
benchmark/server/main.go
View File

@ -30,9 +30,7 @@ import (
"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()

4
benchmark/worker/benchmark_client.go
View File

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

18
codec.go
View File

@ -92,13 +92,11 @@ func (protoCodec) String() string {
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,
}
},
}

14
credentials/credentials.go
View File

@ -34,10 +34,8 @@ import (
"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 @@ type AuthInfo interface {
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).

10
examples/route_guide/mock_routeguide/rg_mock_test.go
View File

@ -29,12 +29,10 @@ import (
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)

10
interop/test_utils.go
View File

@ -394,12 +394,10 @@ func DoPerRPCCreds(tc testpb.TestServiceClient, serviceAccountKeyFile, oauthScop
}
}
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) {

4
resolver/dns/dns_resolver.go
View File

@ -50,9 +50,7 @@ const (
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 {

26
resolver/dns/dns_resolver_test.go
View File

@ -150,9 +150,8 @@ func div(b []byte) []string {
// 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 @@ var (
}
}
]`,
`[
`[
{
"clientLanguage": [
"CPP",
@ -335,7 +334,7 @@ var (
}
}
]`,
`[
`[
{
"clientLanguage": [
"CPP",
@ -434,7 +433,7 @@ var (
}
}
]`,
`[
`[
{
"clientLanguage": [
"CPP",
@ -489,13 +488,11 @@ var (
}
}
]`,
}
)
}
// scs contains an array of service config string in JSON format.
var (
scs = []string{
`{
var scs = []string{
`{
"methodConfig": [
{
"name": [
@ -508,7 +505,7 @@ var (
}
]
}`,
`{
`{
"methodConfig": [
{
"name": [
@ -524,7 +521,7 @@ var (
}
]
}`,
`{
`{
"loadBalancingPolicy": "round_robin",
"methodConfig": [
{
@ -546,8 +543,7 @@ var (
}
]
}`,
}
)
}
// scLookupTbl is a set, which contains targets that have service config. Target
// not in this set should not have service config.

4
resolver/dns/go17_test.go
View File

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

4
resolver/dns/go18_test.go
View File

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

8
server.go
View File

@ -418,11 +418,9 @@ func (s *Server) GetServiceInfo() map[string]ServiceInfo {
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 {

9
transport/bdp_estimator.go
View File

@ -41,12 +41,9 @@ const (
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.