grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various simplifications (gosimple) 

This fixes:
clientconn.go:948:3: should write m = cc.sc.Methods[method[:i+1]] instead of m, _ = cc.sc.Methods[method[:i+1]] (S1005)
encoding/proto/proto_test.go:43:5: should use !bytes.Equal(p.GetBody(), expectedBody) instead (S1004)
resolver/dns/dns_resolver.go:260:2: should merge variable declaration with assignment on next line (S1021)
resolver/dns/dns_resolver.go:344:2: should use 'return <expr>' instead of 'if <expr> { return <bool> }; return <bool>' (S1008)
This commit is contained in:
Karsten Weiss 2018-04-15 13:07:56 +02:00
parent 4d9544a0fd
commit 35a2846daa
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientconn.go
View File

@ -945,7 +945,7 @@ func (cc *ClientConn) GetMethodConfig(method string) MethodConfig {
m, ok := cc.sc.Methods[method] m, ok := cc.sc.Methods[method]
if !ok { if !ok {
i := strings.LastIndex(method, "/") i := strings.LastIndex(method, "/")
m, _ = cc.sc.Methods[method[:i+1]] m = cc.sc.Methods[method[:i+1]]
} }
return m return m
} }

2
encoding/proto/proto_test.go
View File

@ -40,7 +40,7 @@ func marshalAndUnmarshal(t *testing.T, codec encoding.Codec, expectedBody []byte
t.Errorf("codec.Unmarshal(_) returned an error") t.Errorf("codec.Unmarshal(_) returned an error")
} }
if bytes.Compare(p.GetBody(), expectedBody) != 0 { if !bytes.Equal(p.GetBody(), expectedBody) {
t.Errorf("Unexpected body; got %v; want %v", p.GetBody(), expectedBody) t.Errorf("Unexpected body; got %v; want %v", p.GetBody(), expectedBody)
} }
} }

8
resolver/dns/dns_resolver.go
View File

@ -257,8 +257,7 @@ func (d *dnsResolver) lookupHost() []resolver.Address {
} }
func (d *dnsResolver) lookup() ([]resolver.Address, string) { func (d *dnsResolver) lookup() ([]resolver.Address, string) {
var newAddrs []resolver.Address newAddrs := d.lookupSRV()
newAddrs = d.lookupSRV()
// Support fallback to non-balancer address. // Support fallback to non-balancer address.
newAddrs = append(newAddrs, d.lookupHost()...) newAddrs = append(newAddrs, d.lookupHost()...)
sc := d.lookupTXT() sc := d.lookupTXT()
@ -341,10 +340,7 @@ func chosenByPercentage(a *int) bool {
} }
s := rand.NewSource(time.Now().UnixNano()) s := rand.NewSource(time.Now().UnixNano())
r := rand.New(s) r := rand.New(s)
if r.Intn(100)+1 > *a { return r.Intn(100)+1 <= *a
return false
}
return true
} }
func canaryingSC(js string) string { func canaryingSC(js string) string {