diff --git a/clientconn.go b/clientconn.go index 9873b8035..13a1ef9d8 100644 --- a/clientconn.go +++ b/clientconn.go @@ -945,7 +945,7 @@ func (cc *ClientConn) GetMethodConfig(method string) MethodConfig { m, ok := cc.sc.Methods[method] if !ok { i := strings.LastIndex(method, "/") - m, _ = cc.sc.Methods[method[:i+1]] + m = cc.sc.Methods[method[:i+1]] } return m } diff --git a/encoding/proto/proto_test.go b/encoding/proto/proto_test.go index b6a0b6669..10c6f7785 100644 --- a/encoding/proto/proto_test.go +++ b/encoding/proto/proto_test.go @@ -40,7 +40,7 @@ func marshalAndUnmarshal(t *testing.T, codec encoding.Codec, expectedBody []byte 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) } } diff --git a/resolver/dns/dns_resolver.go b/resolver/dns/dns_resolver.go index 6b01acc7a..52de4f0e6 100644 --- a/resolver/dns/dns_resolver.go +++ b/resolver/dns/dns_resolver.go @@ -257,8 +257,7 @@ func (d *dnsResolver) lookupHost() []resolver.Address { } func (d *dnsResolver) lookup() ([]resolver.Address, string) { - var newAddrs []resolver.Address - newAddrs = d.lookupSRV() + newAddrs := d.lookupSRV() // Support fallback to non-balancer address. newAddrs = append(newAddrs, d.lookupHost()...) sc := d.lookupTXT() @@ -341,10 +340,7 @@ func chosenByPercentage(a *int) bool { } s := rand.NewSource(time.Now().UnixNano()) r := rand.New(s) - if r.Intn(100)+1 > *a { - return false - } - return true + return r.Intn(100)+1 <= *a } func canaryingSC(js string) string {