cleanup car handling

Author: brianolson

cmd/relay/bgs/validator.go

@@ -192,11 +192,10 @@ func (val *Validator) VerifyCommitMessage(ctx context.Context, host *models.PDS,
 	commit, repoFragment, err := atrepo.LoadFromCAR(ctx, bytes.NewReader([]byte(msg.Blocks)))
 	if err != nil {
 		commitVerifyErrors.WithLabelValues(hostname, "car").Inc()
-		if !val.Sync11ErrorsAreWarnings || commit == nil || repoFragment == nil {
-			return nil, err
-		} else {
+		if val.Sync11ErrorsAreWarnings {
 			logger.Warn("invalid car", "err", err)
 		}
+		return nil, fmt.Errorf("invalid car, %w", err)
 	}
 
 	if commit.Rev != rev.String() {
@@ -409,11 +408,10 @@ func (val *Validator) HandleSync(ctx context.Context, host *models.PDS, msg *atp
 	commit, err := atrepo.LoadCARCommit(ctx, bytes.NewReader([]byte(msg.Blocks)))
 	if err != nil {
 		commitVerifyErrors.WithLabelValues(hostname, "car").Inc()
-		if !val.Sync11ErrorsAreWarnings || commit == nil {
-			return nil, err
-		} else {
+		if val.Sync11ErrorsAreWarnings {
 			logger.Warn("invalid car", "err", err)
 		}
+		return nil, fmt.Errorf("invalid car, %w", err)
 	}
 
 	if commit.Rev != rev.String() {