Replace clock.Default() with clock.New() (letsencrypt#4761)

jsha · web-flow · commit 75024c3ec15e · 2020-04-08T17:23:43.000-07:00
clock.Default is deprecated: https://godoc.org/github.com/jmhodges/clock#Default
diff --git a/akamai/cache-client.go b/akamai/cache-client.go
@@ -119,7 +119,7 @@ func NewCachePurgeClient(
 		retries:      retries,
 		retryBackoff: retryBackoff,
 		log:          log,
-		clk:          clock.Default(),
+		clk:          clock.New(),
 		purgeLatency: purgeLatency,
 		purges:       purges,
 	}, nil
diff --git a/cmd/cert-checker/main_test.go b/cmd/cert-checker/main_test.go
@@ -53,7 +53,7 @@ func BenchmarkCheckCert(b *testing.B) {
 		test.ResetSATestDatabase(b)()
 	}()
 
-	checker := newChecker(saDbMap, clock.Default(), pa, expectedValidityPeriod)
+	checker := newChecker(saDbMap, clock.New(), pa, expectedValidityPeriod)
 	testKey, _ := rsa.GenerateKey(rand.Reader, 1024)
 	expiry := time.Now().AddDate(0, 0, 1)
 	serial := big.NewInt(1337)
diff --git a/cmd/clock_generic.go b/cmd/clock_generic.go
@@ -4,11 +4,11 @@ package cmd
 
 import "github.com/jmhodges/clock"
 
-// Clock functions similarly to clock.Default(), but the returned value can be
+// Clock functions similarly to clock.New(), but the returned value can be
 // changed using the FAKECLOCK environment variable if the 'integration' build
 // flag is set.
 //
 // This function returns the default Clock.
 func Clock() clock.Clock {
-	return clock.Default()
+	return clock.New()
 }
diff --git a/log/log.go b/log/log.go
@@ -60,7 +60,7 @@ func New(log *syslog.Writer, stdoutLogLevel int, syslogLogLevel int) (Logger, er
 		return nil, errors.New("Attempted to use a nil System Logger.")
 	}
 	return &impl{
-		&bothWriter{log, stdoutLogLevel, syslogLogLevel, clock.Default()},
+		&bothWriter{log, stdoutLogLevel, syslogLogLevel, clock.New()},
 	}, nil
 }
 
diff --git a/mail/mailer.go b/mail/mailer.go
@@ -141,7 +141,7 @@ func New(
 		},
 		log:              logger,
 		from:             from,
-		clk:              clock.Default(),
+		clk:              clock.New(),
 		csprgSource:      realSource{},
 		reconnectBase:    reconnectBase,
 		reconnectMax:     reconnectMax,
@@ -155,7 +155,7 @@ func NewDryRun(from mail.Address, logger blog.Logger) *MailerImpl {
 	return &MailerImpl{
 		dialer:      dryRunClient{logger},
 		from:        from,
-		clk:         clock.Default(),
+		clk:         clock.New(),
 		csprgSource: realSource{},
 		sendMailAttempts: prometheus.NewCounterVec(prometheus.CounterOpts{
 			Name: "send_mail_attempts",
diff --git a/va/dns_test.go b/va/dns_test.go
@@ -157,7 +157,7 @@ func TestDNSValidationNoServer(t *testing.T) {
 		time.Second*5,
 		nil,
 		metrics.NoopRegisterer,
-		clock.Default(),
+		clock.New(),
 		1,
 		log)
 
diff --git a/va/va_test.go b/va/va_test.go
@@ -204,7 +204,7 @@ func setup(
 		userAgent,
 		"letsencrypt.org",
 		metrics.NoopRegisterer,
-		clock.Default(),
+		clock.New(),
 		logger,
 		accountURIPrefixes,
 		"")

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func New(log *syslog.Writer, stdoutLogLevel int, syslogLogLevel int) (Logger, er`
`60`	`60`	`return nil, errors.New("Attempted to use a nil System Logger.")`
`61`	`61`	`}`
`62`	`62`	`return &impl{`
`63`		`- &bothWriter{log, stdoutLogLevel, syslogLogLevel, clock.Default()},`
	`63`	`+ &bothWriter{log, stdoutLogLevel, syslogLogLevel, clock.New()},`
`64`	`64`	`}, nil`
`65`	`65`	`}`
`66`	`66`