Remove mentions to RPC

Author: phbnf

cmd/gcp/main.go

@@ -53,12 +53,11 @@ var (
 	notAfterStart timestampFlag
 	notAfterLimit timestampFlag
 
-	httpEndpoint    = flag.String("http_endpoint", "localhost:6962", "Endpoint for HTTP (host:port).")
-	tlsCert         = flag.String("tls_certificate", "", "Path to server TLS certificate.")
-	tlsKey          = flag.String("tls_key", "", "Path to server TLS private key.")
-	metricsEndpoint = flag.String("metrics_endpoint", "", "Endpoint for serving metrics; if left empty, metrics will be visible on --http_endpoint.")
-	// TODO(phboneff): delete / rename
-	rpcDeadline        = flag.Duration("rpc_deadline", time.Second*10, "Deadline for backend RPC requests.")
+	httpEndpoint       = flag.String("http_endpoint", "localhost:6962", "Endpoint for HTTP (host:port).")
+	tlsCert            = flag.String("tls_certificate", "", "Path to server TLS certificate.")
+	tlsKey             = flag.String("tls_key", "", "Path to server TLS private key.")
+	metricsEndpoint    = flag.String("metrics_endpoint", "", "Endpoint for serving metrics; if left empty, metrics will be visible on --http_endpoint.")
+	tesseraDeadline    = flag.Duration("tessera_deadline", time.Second*10, "Deadline for backend RPC requests.")
 	maskInternalErrors = flag.Bool("mask_internal_errors", false, "Don't return error strings with Internal Server Error HTTP responses.")
 	tracing            = flag.Bool("tracing", false, "If true opencensus Stackdriver tracing will be enabled. See https://opencensus.io/.")
 	tracingProjectID   = flag.String("tracing_project_id", "", "project ID to pass to stackdriver. Can be empty for GCP, consult docs for other platforms.")
@@ -113,7 +112,7 @@ func main() {
 	// client.
 	opts := sctfe.InstanceOptions{
 		Validated:          vCfg,
-		Deadline:           *rpcDeadline,
+		Deadline:           *tesseraDeadline,
 		MetricFactory:      prometheus.MetricFactory{},
 		RequestLog:         new(sctfe.DefaultRequestLog),
 		MaskInternalErrors: *maskInternalErrors,

handlers.go

@@ -127,9 +127,8 @@ func (a AppHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	// Many/most of the handlers forward the request on to the Log RPC server; impose a deadline
-	// on this onward request.
-	ctx, cancel := context.WithDeadline(logCtx, getRPCDeadlineTime(a.Info))
+	// impose a deadline on this onward request.
+	ctx, cancel := context.WithDeadline(logCtx, getDeadlineTime(a.Info))
 	defer cancel()
 
 	var err error
@@ -414,8 +413,8 @@ func getRoots(_ context.Context, li *logInfo, w http.ResponseWriter, _ *http.Req
 	return http.StatusOK, nil
 }
 
-// getRPCDeadlineTime calculates the future time an RPC should expire based on our config
-func getRPCDeadlineTime(li *logInfo) time.Time {
+// getDeadlineTime calculates the future time an RPC should expire based on our config
+func getDeadlineTime(li *logInfo) time.Time {
 	return li.TimeSource.Now().Add(li.instanceOpts.Deadline)
 }
 

handlers_test.go

@@ -35,9 +35,9 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/trillian/monitoring"
-	"github.com/transparency-dev/trillian-tessera/ctonly"
 	"github.com/transparency-dev/static-ct/mockstorage"
 	"github.com/transparency-dev/static-ct/testdata"
+	"github.com/transparency-dev/trillian-tessera/ctonly"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
@@ -532,7 +532,7 @@ func (d dlMatcher) Matches(x interface{}) bool {
 
 	deadlineTime, ok := ctx.Deadline()
 	if !ok {
-		return false // we never make RPC calls without a deadline set
+		return false // we never make calls without a deadline set
 	}
 
 	return deadlineTime == fakeDeadlineTime

instance.go

@@ -39,9 +39,6 @@ type InstanceOptions struct {
 	Deadline time.Duration
 	// MetricFactory allows creating metrics.
 	MetricFactory monitoring.MetricFactory
-	// ErrorMapper converts an error from an RPC request to an HTTP status, plus
-	// a boolean to indicate whether the conversion succeeded.
-	ErrorMapper func(error) (int, bool)
 	// RequestLog provides structured logging of CTFE requests.
 	RequestLog         RequestLog
 	MaskInternalErrors bool