Use consistent capitalization for log messages (#732)

jtraglia · web-flow · commit d8735c29e17d · 2025-02-05T08:41:53.000+01:00
diff --git a/cli/main.go b/cli/main.go
@@ -93,7 +93,7 @@ func start(_ context.Context, cmd *cli.Command) error {
 		log.Error("no relay passed the health-check!")
 	}
 
-	log.Infof("Listening on %v", listenAddr)
+	log.Infof("listening on %v", listenAddr)
 	return service.StartHTTPServer()
 }
 
@@ -108,7 +108,7 @@ func setupRelays(cmd *cli.Command) (relayList, relayMonitorList, types.U256Str,
 		for _, urls := range relayURLs {
 			for _, url := range strings.Split(urls, ",") {
 				if err := relays.Set(strings.TrimSpace(url)); err != nil {
-					log.WithError(err).WithField("relay", url).Fatal("Invalid relay URL")
+					log.WithError(err).WithField("relay", url).Fatal("invalid relay URL")
 				}
 			}
 		}
@@ -128,7 +128,7 @@ func setupRelays(cmd *cli.Command) (relayList, relayMonitorList, types.U256Str,
 		for _, urls := range monitorURLs {
 			for _, url := range strings.Split(urls, ",") {
 				if err := monitors.Set(strings.TrimSpace(url)); err != nil {
-					log.WithError(err).WithField("relayMonitor", url).Fatal("Invalid relay monitor URL")
+					log.WithError(err).WithField("relayMonitor", url).Fatal("invalid relay monitor URL")
 				}
 			}
 		}
@@ -143,10 +143,10 @@ func setupRelays(cmd *cli.Command) (relayList, relayMonitorList, types.U256Str,
 
 	relayMinBidWei, err := sanitizeMinBid(cmd.Float(minBidFlag.Name))
 	if err != nil {
-		log.WithError(err).Fatal("Failed sanitizing min bid")
+		log.WithError(err).Fatal("failed sanitizing min bid")
 	}
 	if relayMinBidWei.BigInt().Sign() > 0 {
-		log.Infof("Min bid set to %v eth (%v wei)", cmd.Float(minBidFlag.Name), relayMinBidWei)
+		log.Infof("min bid set to %v eth (%v wei)", cmd.Float(minBidFlag.Name), relayMinBidWei)
 	}
 	return relays, monitors, *relayMinBidWei, cmd.Bool(relayCheckFlag.Name)
 }
diff --git a/cmd/test-cli/main.go b/cmd/test-cli/main.go
@@ -25,22 +25,22 @@ func doGenerateValidator(filePath string, gasLimit uint64, feeRecipient string)
 	v := newRandomValidator(gasLimit, feeRecipient)
 	err := v.SaveValidator(filePath)
 	if err != nil {
-		log.WithError(err).Fatal("Could not save validator data")
+		log.WithError(err).Fatal("could not save validator data")
 	}
-	log.WithField("file", filePath).Info("Saved validator data")
+	log.WithField("file", filePath).Info("saved validator data")
 }
 
 func doRegisterValidator(v validatorPrivateData, boostEndpoint string, builderSigningDomain phase0.Domain) {
 	message, err := v.PrepareRegistrationMessage(builderSigningDomain)
 	if err != nil {
-		log.WithError(err).Fatal("Could not prepare registration message")
+		log.WithError(err).Fatal("could not prepare registration message")
 	}
 	_, err = server.SendHTTPRequest(context.TODO(), *http.DefaultClient, http.MethodPost, boostEndpoint+"/eth/v1/builder/validators", "test-cli", nil, message, nil)
 	if err != nil {
-		log.WithError(err).Fatal("Validator registration not successful")
+		log.WithError(err).Fatal("validator registration not successful")
 	}
 
-	log.WithError(err).Info("Registered validator")
+	log.WithError(err).Info("registered validator")
 }
 
 func doGetHeader(v validatorPrivateData, boostEndpoint string, beaconNode Beacon, engineEndpoint string, builderSigningDomain phase0.Domain) builderSpec.VersionedSignedBuilderBid {
@@ -72,20 +72,20 @@ func doGetHeader(v validatorPrivateData, boostEndpoint string, beaconNode Beacon
 
 	var getHeaderResp builderSpec.VersionedSignedBuilderBid
 	if _, err := server.SendHTTPRequest(context.TODO(), *http.DefaultClient, http.MethodGet, uri, "test-cli", nil, nil, &getHeaderResp); err != nil {
-		log.WithError(err).WithField("currentBlockHash", currentBlockHash).Fatal("Could not get header")
+		log.WithError(err).WithField("currentBlockHash", currentBlockHash).Fatal("could not get header")
 	}
 
 	if getHeaderResp.Deneb.Message == nil {
-		log.Fatal("Did not receive correct header")
+		log.Fatal("did not receive correct header")
 	}
-	log.WithField("header", *getHeaderResp.Deneb.Message).Info("Got header from boost")
+	log.WithField("header", *getHeaderResp.Deneb.Message).Info("got header from boost")
 
 	ok, err := ssz.VerifySignature(getHeaderResp.Deneb.Message, builderSigningDomain, getHeaderResp.Deneb.Message.Pubkey[:], getHeaderResp.Deneb.Signature[:])
 	if err != nil {
-		log.WithError(err).Fatal("Could not verify builder bid signature")
+		log.WithError(err).Fatal("could not verify builder bid signature")
 	}
 	if !ok {
-		log.Fatal("Incorrect builder bid signature")
+		log.Fatal("incorrect builder bid signature")
 	}
 
 	return getHeaderResp
@@ -128,7 +128,7 @@ func doGetPayload(v validatorPrivateData, boostEndpoint string, beaconNode Beaco
 	}
 
 	if respPayload.IsEmpty() {
-		log.Fatal("Did not receive correct payload")
+		log.Fatal("did not receive correct payload")
 	}
 	log.WithField("payload", respPayload).Info("got payload from mev-boost")
 }
@@ -242,7 +242,7 @@ func main() {
 		}
 		doGetPayload(mustLoadValidator(validatorDataFile), boostEndpoint, createBeacon(isMergemock, beaconEndpoint, engineEndpoint), engineEndpoint, builderSigningDomain, proposerSigningDomain)
 	default:
-		log.Info("Expected generate|register|getHeader|getPayload subcommand")
+		log.Info("expected generate|register|getHeader|getPayload subcommand")
 		os.Exit(1)
 	}
 }
diff --git a/cmd/test-cli/validator.go b/cmd/test-cli/validator.go
@@ -34,12 +34,12 @@ func (v *validatorPrivateData) SaveValidator(filePath string) error {
 func mustLoadValidator(filePath string) validatorPrivateData {
 	fileData, err := os.ReadFile(filePath)
 	if err != nil {
-		log.WithField("filePath", filePath).WithError(err).Fatal("Could not load validator data")
+		log.WithField("filePath", filePath).WithError(err).Fatal("could not load validator data")
 	}
 	var v validatorPrivateData
 	err = json.Unmarshal(fileData, &v)
 	if err != nil {
-		log.WithField("filePath", filePath).WithField("fileData", fileData).WithError(err).Fatal("Could not parse validator data")
+		log.WithField("filePath", filePath).WithField("fileData", fileData).WithError(err).Fatal("could not parse validator data")
 	}
 	return v
 }
diff --git a/server/get_payload.go b/server/get_payload.go
@@ -123,7 +123,7 @@ func processPayload[P Payload](m *BoostService, log *logrus.Entry, ua UserAgent,
 				resultCh <- responsePayload
 				log.Info("received payload from relay")
 			} else {
-				log.Trace("Discarding response, already received a correct response")
+				log.Trace("discarding response, already received a correct response")
 			}
 		}(relay)
 	}
diff --git a/server/service.go b/server/service.go
@@ -141,7 +141,7 @@ func (m *BoostService) respondError(w http.ResponseWriter, code int, message str
 	w.WriteHeader(code)
 	resp := httpErrorResp{code, message}
 	if err := json.NewEncoder(w).Encode(resp); err != nil {
-		m.log.WithField("response", resp).WithError(err).Error("Couldn't write error response")
+		m.log.WithField("response", resp).WithError(err).Error("could not write error response")
 		http.Error(w, "", http.StatusInternalServerError)
 	}
 }
@@ -150,7 +150,7 @@ func (m *BoostService) respondOK(w http.ResponseWriter, response any) {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 	if err := json.NewEncoder(w).Encode(response); err != nil {
-		m.log.WithField("response", response).WithError(err).Error("Couldn't write OK response")
+		m.log.WithField("response", response).WithError(err).Error("could not write OK response")
 		http.Error(w, "", http.StatusInternalServerError)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func start(_ context.Context, cmd *cli.Command) error {`
`93`	`93`	`log.Error("no relay passed the health-check!")`
`94`	`94`	`}`
`95`	`95`
`96`		`- log.Infof("Listening on %v", listenAddr)`
	`96`	`+ log.Infof("listening on %v", listenAddr)`
`97`	`97`	`return service.StartHTTPServer()`
`98`	`98`	`}`
`99`	`99`
`@@ -108,7 +108,7 @@ func setupRelays(cmd *cli.Command) (relayList, relayMonitorList, types.U256Str,`
`108`	`108`	`for _, urls := range relayURLs {`
`109`	`109`	`for _, url := range strings.Split(urls, ",") {`
`110`	`110`	`if err := relays.Set(strings.TrimSpace(url)); err != nil {`
`111`		`- log.WithError(err).WithField("relay", url).Fatal("Invalid relay URL")`
	`111`	`+ log.WithError(err).WithField("relay", url).Fatal("invalid relay URL")`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`
`@@ -128,7 +128,7 @@ func setupRelays(cmd *cli.Command) (relayList, relayMonitorList, types.U256Str,`
`128`	`128`	`for _, urls := range monitorURLs {`
`129`	`129`	`for _, url := range strings.Split(urls, ",") {`
`130`	`130`	`if err := monitors.Set(strings.TrimSpace(url)); err != nil {`
`131`		`- log.WithError(err).WithField("relayMonitor", url).Fatal("Invalid relay monitor URL")`
	`131`	`+ log.WithError(err).WithField("relayMonitor", url).Fatal("invalid relay monitor URL")`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}`
`@@ -143,10 +143,10 @@ func setupRelays(cmd *cli.Command) (relayList, relayMonitorList, types.U256Str,`
`143`	`143`
`144`	`144`	`relayMinBidWei, err := sanitizeMinBid(cmd.Float(minBidFlag.Name))`
`145`	`145`	`if err != nil {`
`146`		`- log.WithError(err).Fatal("Failed sanitizing min bid")`
	`146`	`+ log.WithError(err).Fatal("failed sanitizing min bid")`
`147`	`147`	`}`
`148`	`148`	`if relayMinBidWei.BigInt().Sign() > 0 {`
`149`		`- log.Infof("Min bid set to %v eth (%v wei)", cmd.Float(minBidFlag.Name), relayMinBidWei)`
	`149`	`+ log.Infof("min bid set to %v eth (%v wei)", cmd.Float(minBidFlag.Name), relayMinBidWei)`
`150`	`150`	`}`
`151`	`151`	`return relays, monitors, *relayMinBidWei, cmd.Bool(relayCheckFlag.Name)`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,22 +25,22 @@ func doGenerateValidator(filePath string, gasLimit uint64, feeRecipient string)`
`25`	`25`	`v := newRandomValidator(gasLimit, feeRecipient)`
`26`	`26`	`err := v.SaveValidator(filePath)`
`27`	`27`	`if err != nil {`
`28`		`- log.WithError(err).Fatal("Could not save validator data")`
	`28`	`+ log.WithError(err).Fatal("could not save validator data")`
`29`	`29`	`}`
`30`		`- log.WithField("file", filePath).Info("Saved validator data")`
	`30`	`+ log.WithField("file", filePath).Info("saved validator data")`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func doRegisterValidator(v validatorPrivateData, boostEndpoint string, builderSigningDomain phase0.Domain) {`
`34`	`34`	`message, err := v.PrepareRegistrationMessage(builderSigningDomain)`
`35`	`35`	`if err != nil {`
`36`		`- log.WithError(err).Fatal("Could not prepare registration message")`
	`36`	`+ log.WithError(err).Fatal("could not prepare registration message")`
`37`	`37`	`}`
`38`	`38`	`_, err = server.SendHTTPRequest(context.TODO(), *http.DefaultClient, http.MethodPost, boostEndpoint+"/eth/v1/builder/validators", "test-cli", nil, message, nil)`
`39`	`39`	`if err != nil {`
`40`		`- log.WithError(err).Fatal("Validator registration not successful")`
	`40`	`+ log.WithError(err).Fatal("validator registration not successful")`
`41`	`41`	`}`
`42`	`42`
`43`		`- log.WithError(err).Info("Registered validator")`
	`43`	`+ log.WithError(err).Info("registered validator")`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func doGetHeader(v validatorPrivateData, boostEndpoint string, beaconNode Beacon, engineEndpoint string, builderSigningDomain phase0.Domain) builderSpec.VersionedSignedBuilderBid {`
`@@ -72,20 +72,20 @@ func doGetHeader(v validatorPrivateData, boostEndpoint string, beaconNode Beacon`
`72`	`72`
`73`	`73`	`var getHeaderResp builderSpec.VersionedSignedBuilderBid`
`74`	`74`	`if _, err := server.SendHTTPRequest(context.TODO(), *http.DefaultClient, http.MethodGet, uri, "test-cli", nil, nil, &getHeaderResp); err != nil {`
`75`		`- log.WithError(err).WithField("currentBlockHash", currentBlockHash).Fatal("Could not get header")`
	`75`	`+ log.WithError(err).WithField("currentBlockHash", currentBlockHash).Fatal("could not get header")`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if getHeaderResp.Deneb.Message == nil {`
`79`		`- log.Fatal("Did not receive correct header")`
	`79`	`+ log.Fatal("did not receive correct header")`
`80`	`80`	`}`
`81`		`- log.WithField("header", *getHeaderResp.Deneb.Message).Info("Got header from boost")`
	`81`	`+ log.WithField("header", *getHeaderResp.Deneb.Message).Info("got header from boost")`
`82`	`82`
`83`	`83`	`ok, err := ssz.VerifySignature(getHeaderResp.Deneb.Message, builderSigningDomain, getHeaderResp.Deneb.Message.Pubkey[:], getHeaderResp.Deneb.Signature[:])`
`84`	`84`	`if err != nil {`
`85`		`- log.WithError(err).Fatal("Could not verify builder bid signature")`
	`85`	`+ log.WithError(err).Fatal("could not verify builder bid signature")`
`86`	`86`	`}`
`87`	`87`	`if !ok {`
`88`		`- log.Fatal("Incorrect builder bid signature")`
	`88`	`+ log.Fatal("incorrect builder bid signature")`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`return getHeaderResp`
`@@ -128,7 +128,7 @@ func doGetPayload(v validatorPrivateData, boostEndpoint string, beaconNode Beaco`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`if respPayload.IsEmpty() {`
`131`		`- log.Fatal("Did not receive correct payload")`
	`131`	`+ log.Fatal("did not receive correct payload")`
`132`	`132`	`}`
`133`	`133`	`log.WithField("payload", respPayload).Info("got payload from mev-boost")`
`134`	`134`	`}`
`@@ -242,7 +242,7 @@ func main() {`
`242`	`242`	`}`
`243`	`243`	`doGetPayload(mustLoadValidator(validatorDataFile), boostEndpoint, createBeacon(isMergemock, beaconEndpoint, engineEndpoint), engineEndpoint, builderSigningDomain, proposerSigningDomain)`
`244`	`244`	`default:`
`245`		`- log.Info("Expected generate\|register\|getHeader\|getPayload subcommand")`
	`245`	`+ log.Info("expected generate\|register\|getHeader\|getPayload subcommand")`
`246`	`246`	`os.Exit(1)`
`247`	`247`	`}`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,12 @@ func (v *validatorPrivateData) SaveValidator(filePath string) error {`
`34`	`34`	`func mustLoadValidator(filePath string) validatorPrivateData {`
`35`	`35`	`fileData, err := os.ReadFile(filePath)`
`36`	`36`	`if err != nil {`
`37`		`- log.WithField("filePath", filePath).WithError(err).Fatal("Could not load validator data")`
	`37`	`+ log.WithField("filePath", filePath).WithError(err).Fatal("could not load validator data")`
`38`	`38`	`}`
`39`	`39`	`var v validatorPrivateData`
`40`	`40`	`err = json.Unmarshal(fileData, &v)`
`41`	`41`	`if err != nil {`
`42`		`- log.WithField("filePath", filePath).WithField("fileData", fileData).WithError(err).Fatal("Could not parse validator data")`
	`42`	`+ log.WithField("filePath", filePath).WithField("fileData", fileData).WithError(err).Fatal("could not parse validator data")`
`43`	`43`	`}`
`44`	`44`	`return v`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func processPayload[P Payload](m BoostService, log logrus.Entry, ua UserAgent,`
`123`	`123`	`resultCh <- responsePayload`
`124`	`124`	`log.Info("received payload from relay")`
`125`	`125`	`} else {`
`126`		`- log.Trace("Discarding response, already received a correct response")`
	`126`	`+ log.Trace("discarding response, already received a correct response")`
`127`	`127`	`}`
`128`	`128`	`}(relay)`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func (m *BoostService) respondError(w http.ResponseWriter, code int, message str`
`141`	`141`	`w.WriteHeader(code)`
`142`	`142`	`resp := httpErrorResp{code, message}`
`143`	`143`	`if err := json.NewEncoder(w).Encode(resp); err != nil {`
`144`		`- m.log.WithField("response", resp).WithError(err).Error("Couldn't write error response")`
	`144`	`+ m.log.WithField("response", resp).WithError(err).Error("could not write error response")`
`145`	`145`	`http.Error(w, "", http.StatusInternalServerError)`
`146`	`146`	`}`
`147`	`147`	`}`
`@@ -150,7 +150,7 @@ func (m *BoostService) respondOK(w http.ResponseWriter, response any) {`
`150`	`150`	`w.Header().Set("Content-Type", "application/json")`
`151`	`151`	`w.WriteHeader(http.StatusOK)`
`152`	`152`	`if err := json.NewEncoder(w).Encode(response); err != nil {`
`153`		`- m.log.WithField("response", response).WithError(err).Error("Couldn't write OK response")`
	`153`	`+ m.log.WithField("response", response).WithError(err).Error("could not write OK response")`
`154`	`154`	`http.Error(w, "", http.StatusInternalServerError)`
`155`	`155`	`}`
`156`	`156`	`}`