Remove special BCode type (#1912)

cmd/caa-checker/server.go

@@ -191,12 +191,12 @@ func (ccs *caaCheckerServer) ValidForIssuance(ctx context.Context, check *pb.Che
 	present, valid, err := ccs.checkCAA(ctx, *check.Name, *check.IssuerDomain)
 	if err != nil {
 		if err == context.DeadlineExceeded || err == context.Canceled {
-			return nil, bgrpc.CodedError(bgrpc.DNSQueryTimeout.GRPCCode(), err.Error())
+			return nil, bgrpc.CodedError(bgrpc.DNSQueryTimeout, err.Error())
 		}
 		if dnsErr, ok := err.(*bdns.DNSError); ok {
-			return nil, bgrpc.CodedError(bgrpc.DNSError.GRPCCode(), dnsErr.Error())
+			return nil, bgrpc.CodedError(bgrpc.DNSError, dnsErr.Error())
 		}
-		return nil, bgrpc.CodedError(bgrpc.DNSError.GRPCCode(), "server failure at resolver")
+		return nil, bgrpc.CodedError(bgrpc.DNSError, "server failure at resolver")
 	}
 	return &pb.Result{Present: &present, Valid: &valid}, nil
 }

grpc/bcode_string.go

@@ -1,17 +0,0 @@
-// Code generated by "stringer -type=BCode bcodes.go"; DO NOT EDIT
-
-package grpc
-
-import "fmt"
-
-const _BCode_name = "DNSQueryTimeoutDNSError"
-
-var _BCode_index = [...]uint8{0, 15, 23}
-
-func (i BCode) String() string {
-	i -= 100
-	if i >= BCode(len(_BCode_index)-1) {
-		return fmt.Sprintf("BCode(%d)", i+100)
-	}
-	return _BCode_name[_BCode_index[i]:_BCode_index[i+1]]
-}

grpc/bcodes.go

@@ -6,31 +6,21 @@ import (
 	"github.com/letsencrypt/boulder/probs"
 )
 
-//go:generate stringer -type=BCode bcodes.go
-
-// BCode is an alias so we can use a stringer
-type BCode codes.Code
-
-// GRPCCode returns the gRPC version of the error code
-func (b BCode) GRPCCode() codes.Code {
-	return codes.Code(b)
-}
-
 // gRPC error codes used by Boulder. While the gRPC codes
 // end at 16 we start at 100 to provide a little leeway
 // in case they ever decide to add more
 const (
 	// DNSQueryTimeout is used when DNS queries timeout
-	DNSQueryTimeout BCode = 100
+	DNSQueryTimeout codes.Code = 100
 
 	// DNSError is used when DNS queries fail for some reason
-	DNSError BCode = 101
+	DNSError codes.Code = 101
 )
 
 // CodeToProblem takes a gRPC error code and translates it to
 // a Boulder ProblemType
 func CodeToProblem(c codes.Code) probs.ProblemType {
-	switch BCode(c) {
+	switch c {
 	case DNSQueryTimeout:
 		return probs.ConnectionProblem
 	case DNSError:

test/boulder-tools/build.sh

@@ -36,7 +36,6 @@ GOBIN=/usr/local/bin GOPATH=/tmp/gopath go get \
   github.com/mattn/goveralls \
   github.com/modocache/gover \
   github.com/tools/godep \
-  golang.org/x/tools/cmd/stringer \
   golang.org/x/tools/cover &
 
 wait

test/setup.sh

@@ -17,7 +17,6 @@ go get \
   github.com/mattn/goveralls \
   github.com/modocache/gover \
   github.com/tools/godep \
-  golang.org/x/tools/cmd/stringer \
   golang.org/x/tools/cover &
 
 (curl -sL https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz | \