From 057468befff3e5e4c39ce6315f17f81910e8afde Mon Sep 17 00:00:00 2001
From: Jared Wasinger <j-wasinger@hotmail.com>
Date: Mon, 6 Nov 2023 15:36:56 +0800
Subject: [PATCH] appease linter

---
 cmd/utils/flags.go | 28 +++++++++++++++-------------
 params/config.go   |  4 ++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index a9f19a3e70..d79009bcb3 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -1646,38 +1646,40 @@ func CheckExclusive(ctx *cli.Context, args ...interface{}) {
 	}
 }
 
+// validateDeveloperGenesis asserts that a provided genesis can be used with dev mode:
+// it requires pre-merge hard-forks and proof-of-stake to be activated at block 0
 func validateDeveloperGenesis(genesis *core.Genesis) error {
-	checkHFIsZero := func(forkName string, hfBlockNumber *big.Int) error {
+	checkForkIsBlock0 := func(forkName string, hfBlockNumber *big.Int) error {
 		if hfBlockNumber == nil {
-			return errors.New(fmt.Sprintf("%s: hard-fork not enabled", forkName))
+			return fmt.Errorf("%s: hard-fork not enabled", forkName)
 		} else if hfBlockNumber.Cmp(big.NewInt(0)) != 0 {
-			return errors.New(fmt.Sprintf("%s: hard-fork not activated in block 0", forkName))
+			return fmt.Errorf("%s: hard-fork not activated in block 0", forkName)
 		}
 		return nil
 	}
 
 	config := genesis.Config
-	if err := checkHFIsZero("Homestead", config.HomesteadBlock); err != nil {
+	if err := checkForkIsBlock0("Homestead", config.HomesteadBlock); err != nil {
 		return err
 	} else if config.DAOForkBlock != nil {
 		return errors.New("DAO hardfork cannot be enabled")
-	} else if err := checkHFIsZero("EIP150", config.EIP150Block); err != nil {
+	} else if err := checkForkIsBlock0("EIP150", config.EIP150Block); err != nil {
 		return err
-	} else if err := checkHFIsZero("EIP155", config.EIP155Block); err != nil {
+	} else if err := checkForkIsBlock0("EIP155", config.EIP155Block); err != nil {
 		return err
-	} else if err := checkHFIsZero("EIP158", config.EIP158Block); err != nil {
+	} else if err := checkForkIsBlock0("EIP158", config.EIP158Block); err != nil {
 		return err
-	} else if err := checkHFIsZero("Byzantium", config.ByzantiumBlock); err != nil {
+	} else if err := checkForkIsBlock0("Byzantium", config.ByzantiumBlock); err != nil {
 		return err
-	} else if err := checkHFIsZero("Constantinople", config.ConstantinopleBlock); err != nil {
+	} else if err := checkForkIsBlock0("Constantinople", config.ConstantinopleBlock); err != nil {
 		return err
-	} else if err := checkHFIsZero("Istanbul", config.IstanbulBlock); err != nil {
+	} else if err := checkForkIsBlock0("Istanbul", config.IstanbulBlock); err != nil {
 		return err
-	} else if err := checkHFIsZero("Berlin", config.BerlinBlock); err != nil {
+	} else if err := checkForkIsBlock0("Berlin", config.BerlinBlock); err != nil {
 		return err
-	} else if err := checkHFIsZero("London", config.LondonBlock); err != nil {
+	} else if err := checkForkIsBlock0("London", config.LondonBlock); err != nil {
 		return err
-	} else if config.TerminalTotalDifficultyPassed != true {
+	} else if !config.TerminalTotalDifficultyPassed {
 		return errors.New("terminal total difficulty must be passed")
 	}
 	return nil
diff --git a/params/config.go b/params/config.go
index 517130f86a..463041bd01 100644
--- a/params/config.go
+++ b/params/config.go
@@ -328,8 +328,8 @@ type ChainConfig struct {
 	TerminalTotalDifficultyPassed bool `json:"terminalTotalDifficultyPassed,omitempty"`
 
 	// Various consensus engines
-	Ethash    *EthashConfig `json:"ethash,omitempty"`
-	Clique    *CliqueConfig `json:"clique,omitempty"`
+	Ethash *EthashConfig `json:"ethash,omitempty"`
+	Clique *CliqueConfig `json:"clique,omitempty"`
 }
 
 // EthashConfig is the consensus engine configs for proof-of-work based sealing.