From 72aa66e52c71a527acc11faa63c79e5943acf48e Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Thu, 29 Apr 2021 19:07:12 +0200
Subject: [PATCH 1/3] Ensure state could be created in ToBlock

---
 cmd/devp2p/internal/ethtest/chain.go | 15 +++++++++------
 cmd/evm/runner.go                    | 10 ++++++++--
 cmd/faucet/faucet.go                 |  6 +++++-
 consensus/clique/snapshot_test.go    |  3 ++-
 core/genesis.go                      | 26 ++++++++++++++++++++------
 core/genesis_test.go                 | 10 ++++++++--
 eth/catalyst/api_test.go             |  4 ++--
 ethclient/ethclient_test.go          |  2 +-
 les/peer_test.go                     |  3 ++-
 tests/state_test_util.go             |  5 ++++-
 10 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go
index 83c55181ada4..206811ba4f8e 100644
--- a/cmd/devp2p/internal/ethtest/chain.go
+++ b/cmd/devp2p/internal/ethtest/chain.go
@@ -34,7 +34,6 @@ import (
 )
 
 type Chain struct {
-	genesis     core.Genesis
 	blocks      []*types.Block
 	chainConfig *params.ChainConfig
 }
@@ -129,7 +128,10 @@ func loadChain(chainfile string, genesis string) (*Chain, error) {
 	if err != nil {
 		return nil, err
 	}
-	gblock := gen.ToBlock(nil)
+	gblock, err := gen.ToBlock(nil)
+	if err != nil {
+		return nil, err
+	}
 
 	blocks, err := blocksFromFile(chainfile, gblock)
 	if err != nil {
@@ -147,10 +149,9 @@ func loadGenesis(genesisFile string) (core.Genesis, error) {
 	}
 	var gen core.Genesis
 	if err := json.Unmarshal(chainConfig, &gen); err != nil {
-		return core.Genesis{}, err
+		return nil, err
 	}
-	return gen, nil
-}
+	gblock := gen.ToBlock(nil)
 
 func blocksFromFile(chainfile string, gblock *types.Block) ([]*types.Block, error) {
 	// Load chain.rlp.
@@ -180,5 +181,7 @@ func blocksFromFile(chainfile string, gblock *types.Block) ([]*types.Block, erro
 		}
 		blocks = append(blocks, &b)
 	}
-	return blocks, nil
+
+	c := &Chain{blocks: blocks, chainConfig: gen.Config}
+	return c, nil
 }
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
index 4063767cb8f4..1058f49c8ca7 100644
--- a/cmd/evm/runner.go
+++ b/cmd/evm/runner.go
@@ -136,8 +136,14 @@ func runCmd(ctx *cli.Context) error {
 		gen := readGenesis(ctx.GlobalString(GenesisFlag.Name))
 		genesisConfig = gen
 		db := rawdb.NewMemoryDatabase()
-		genesis := gen.ToBlock(db)
-		statedb, _ = state.New(genesis.Root(), state.NewDatabase(db), nil)
+		genesis, err := gen.ToBlock(db)
+		if err != nil {
+			return err
+		}
+		statedb, err = state.New(genesis.Root(), state.NewDatabase(db), nil)
+		if err != nil {
+			return err
+		}
 		chainConfig = gen.Config
 	} else {
 		statedb, _ = state.New(common.Hash{}, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
index bb5375384f89..347a1fd788ec 100644
--- a/cmd/faucet/faucet.go
+++ b/cmd/faucet/faucet.go
@@ -251,7 +251,11 @@ func newFaucet(genesis *core.Genesis, port int, enodes []*enode.Node, network ui
 	cfg.SyncMode = downloader.LightSync
 	cfg.NetworkId = network
 	cfg.Genesis = genesis
-	utils.SetDNSDiscoveryDefaults(&cfg, genesis.ToBlock(nil).Hash())
+	gblock, err := genesis.ToBlock(nil)
+	if err != nil {
+		return err
+	}
+	utils.SetDNSDiscoveryDefaults(&cfg, gblock.Hash())
 
 	lesBackend, err := les.New(stack, &cfg)
 	if err != nil {
diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go
index 039ba919bf8d..c4080c1f7e91 100644
--- a/consensus/clique/snapshot_test.go
+++ b/consensus/clique/snapshot_test.go
@@ -412,7 +412,8 @@ func TestClique(t *testing.T) {
 		engine := New(config.Clique, db)
 		engine.fakeDiff = true
 
-		blocks, _ := core.GenerateChain(&config, genesis.ToBlock(db), engine, db, len(tt.votes), func(j int, gen *core.BlockGen) {
+		gblock, _ := genesis.ToBlock(db)
+		blocks, _ := core.GenerateChain(&config, gblock, engine, db, len(tt.votes), func(j int, gen *core.BlockGen) {
 			// Cast the vote contained in this block
 			gen.SetCoinbase(accounts.address(tt.votes[j].voted))
 			if tt.votes[j].auth {
diff --git a/core/genesis.go b/core/genesis.go
index e05e27fe1750..c6a94c260e20 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -183,7 +183,11 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, override
 			genesis = DefaultGenesisBlock()
 		}
 		// Ensure the stored genesis matches with the given one.
-		hash := genesis.ToBlock(nil).Hash()
+		gBlock, err := genesis.ToBlock(nil)
+		if err != nil {
+			return genesis.Config, common.Hash{}, err
+		}
+		hash := gBlock.Hash()
 		if hash != stored {
 			return genesis.Config, hash, &GenesisMismatchError{stored, hash}
 		}
@@ -195,7 +199,11 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, override
 	}
 	// Check whether the genesis block is already written.
 	if genesis != nil {
-		hash := genesis.ToBlock(nil).Hash()
+		gBlock, err := genesis.ToBlock(nil)
+		if err != nil {
+			return genesis.Config, common.Hash{}, err
+		}
+		hash := gBlock.Hash()
 		if hash != stored {
 			return genesis.Config, hash, &GenesisMismatchError{stored, hash}
 		}
@@ -255,11 +263,14 @@ func (g *Genesis) configOrDefault(ghash common.Hash) *params.ChainConfig {
 
 // ToBlock creates the genesis block and writes state of a genesis specification
 // to the given database (or discards it if nil).
-func (g *Genesis) ToBlock(db ethdb.Database) *types.Block {
+func (g *Genesis) ToBlock(db ethdb.Database) (*types.Block, error) {
 	if db == nil {
 		db = rawdb.NewMemoryDatabase()
 	}
-	statedb, _ := state.New(common.Hash{}, state.NewDatabase(db), nil)
+	statedb, err := state.New(common.Hash{}, state.NewDatabase(db), nil)
+	if err != nil {
+		return nil, err
+	}
 	for addr, account := range g.Alloc {
 		statedb.AddBalance(addr, account.Balance)
 		statedb.SetCode(addr, account.Code)
@@ -291,13 +302,16 @@ func (g *Genesis) ToBlock(db ethdb.Database) *types.Block {
 	statedb.Commit(false)
 	statedb.Database().TrieDB().Commit(root, true, nil)
 
-	return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil))
+	return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil)), nil
 }
 
 // Commit writes the block and state of a genesis specification to the database.
 // The block is committed as the canonical head block.
 func (g *Genesis) Commit(db ethdb.Database) (*types.Block, error) {
-	block := g.ToBlock(db)
+	block, err := g.ToBlock(db)
+	if err != nil {
+		return nil, err
+	}
 	if block.Number().Sign() != 0 {
 		return nil, fmt.Errorf("can't commit genesis block with number > 0")
 	}
diff --git a/core/genesis_test.go b/core/genesis_test.go
index 44c1ef253ac7..50fa7e0071f8 100644
--- a/core/genesis_test.go
+++ b/core/genesis_test.go
@@ -31,11 +31,17 @@ import (
 )
 
 func TestDefaultGenesisBlock(t *testing.T) {
-	block := DefaultGenesisBlock().ToBlock(nil)
+	block, err := DefaultGenesisBlock().ToBlock(nil)
+	if err != nil {
+		t.Fatalf("error getting genesis block: %v", err)
+	}
 	if block.Hash() != params.MainnetGenesisHash {
 		t.Errorf("wrong mainnet genesis hash, got %v, want %v", block.Hash(), params.MainnetGenesisHash)
 	}
-	block = DefaultRopstenGenesisBlock().ToBlock(nil)
+	block, err = DefaultRopstenGenesisBlock().ToBlock(nil)
+	if err != nil {
+		t.Fatalf("error getting ropsten genesis block: %v", err)
+	}
 	if block.Hash() != params.RopstenGenesisHash {
 		t.Errorf("wrong ropsten genesis hash, got %v, want %v", block.Hash(), params.RopstenGenesisHash)
 	}
diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go
index b8a6e43fcd13..85bc8fce36b3 100644
--- a/eth/catalyst/api_test.go
+++ b/eth/catalyst/api_test.go
@@ -54,7 +54,7 @@ func generateTestChain() (*core.Genesis, []*types.Block) {
 		g.OffsetTime(5)
 		g.SetExtra([]byte("test"))
 	}
-	gblock := genesis.ToBlock(db)
+	gblock, _ := genesis.ToBlock(db)
 	engine := ethash.NewFaker()
 	blocks, _ := core.GenerateChain(config, gblock, engine, db, 10, generate)
 	blocks = append([]*types.Block{gblock}, blocks...)
@@ -95,7 +95,7 @@ func generateTestChainWithFork(n int, fork int) (*core.Genesis, []*types.Block,
 		g.OffsetTime(5)
 		g.SetExtra([]byte("testF"))
 	}
-	gblock := genesis.ToBlock(db)
+	gblock, _ := genesis.ToBlock(db)
 	engine := ethash.NewFaker()
 	blocks, _ := core.GenerateChain(config, gblock, engine, db, n, generate)
 	blocks = append([]*types.Block{gblock}, blocks...)
diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go
index 9fa5bf87a493..feb87d35db46 100644
--- a/ethclient/ethclient_test.go
+++ b/ethclient/ethclient_test.go
@@ -225,7 +225,7 @@ func generateTestChain() (*core.Genesis, []*types.Block) {
 		g.OffsetTime(5)
 		g.SetExtra([]byte("test"))
 	}
-	gblock := genesis.ToBlock(db)
+	gblock, _ := genesis.ToBlock(db)
 	engine := ethash.NewFaker()
 	blocks, _ := core.GenerateChain(config, gblock, engine, db, 1, generate)
 	blocks = append([]*types.Block{gblock}, blocks...)
diff --git a/les/peer_test.go b/les/peer_test.go
index d6551ce6b639..7c2b2abf65bb 100644
--- a/les/peer_test.go
+++ b/les/peer_test.go
@@ -100,7 +100,8 @@ type fakeChain struct{}
 
 func (f *fakeChain) Config() *params.ChainConfig { return params.MainnetChainConfig }
 func (f *fakeChain) Genesis() *types.Block {
-	return core.DefaultGenesisBlock().ToBlock(rawdb.NewMemoryDatabase())
+	block, _ := core.DefaultGenesisBlock().ToBlock(rawdb.NewMemoryDatabase())
+	return block
 }
 func (f *fakeChain) CurrentHeader() *types.Header { return &types.Header{Number: big.NewInt(10000000)} }
 
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index 46834de6daeb..ea342304e864 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -174,7 +174,10 @@ func (t *StateTest) RunNoVerify(subtest StateSubtest, vmconfig vm.Config, snapsh
 		return nil, nil, common.Hash{}, UnsupportedForkError{subtest.Fork}
 	}
 	vmconfig.ExtraEips = eips
-	block := t.genesis(config).ToBlock(nil)
+	block, err := t.genesis(config).ToBlock(nil)
+	if err != nil {
+		return nil, nil, common.Hash{}, err
+	}
 	snaps, statedb := MakePreState(rawdb.NewMemoryDatabase(), t.json.Pre, snapshotter)
 
 	post := t.json.Post[subtest.Fork][subtest.Index]

From ad54f31e200cb4406d5c14badc11aee502365c77 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Fri, 30 Apr 2021 09:13:26 +0200
Subject: [PATCH 2/3] Fix rebase errors

---
 cmd/devp2p/internal/ethtest/chain.go | 9 +++++----
 cmd/faucet/faucet.go                 | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go
index 206811ba4f8e..4b0f3ed9c468 100644
--- a/cmd/devp2p/internal/ethtest/chain.go
+++ b/cmd/devp2p/internal/ethtest/chain.go
@@ -34,6 +34,7 @@ import (
 )
 
 type Chain struct {
+	genesis     core.Genesis
 	blocks      []*types.Block
 	chainConfig *params.ChainConfig
 }
@@ -149,9 +150,10 @@ func loadGenesis(genesisFile string) (core.Genesis, error) {
 	}
 	var gen core.Genesis
 	if err := json.Unmarshal(chainConfig, &gen); err != nil {
-		return nil, err
+		return core.Genesis{}, err
 	}
-	gblock := gen.ToBlock(nil)
+	return gen, nil
+}
 
 func blocksFromFile(chainfile string, gblock *types.Block) ([]*types.Block, error) {
 	// Load chain.rlp.
@@ -182,6 +184,5 @@ func blocksFromFile(chainfile string, gblock *types.Block) ([]*types.Block, erro
 		blocks = append(blocks, &b)
 	}
 
-	c := &Chain{blocks: blocks, chainConfig: gen.Config}
-	return c, nil
+	return blocks, nil
 }
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
index 347a1fd788ec..02ac4de4d042 100644
--- a/cmd/faucet/faucet.go
+++ b/cmd/faucet/faucet.go
@@ -253,7 +253,7 @@ func newFaucet(genesis *core.Genesis, port int, enodes []*enode.Node, network ui
 	cfg.Genesis = genesis
 	gblock, err := genesis.ToBlock(nil)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	utils.SetDNSDiscoveryDefaults(&cfg, gblock.Hash())
 

From 5e87141fa671768a9221b4386901752c7e155f63 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Tue, 11 May 2021 15:22:26 +0200
Subject: [PATCH 3/3] use a panic instead

---
 cmd/devp2p/internal/ethtest/chain.go |  6 +-----
 cmd/evm/runner.go                    | 10 ++--------
 cmd/faucet/faucet.go                 |  6 +-----
 consensus/clique/snapshot_test.go    |  3 +--
 core/genesis.go                      | 23 ++++++-----------------
 core/genesis_test.go                 | 10 ++--------
 eth/catalyst/api_test.go             |  4 ++--
 ethclient/ethclient_test.go          |  2 +-
 les/peer_test.go                     |  3 +--
 tests/state_test_util.go             |  5 +----
 10 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go
index 4b0f3ed9c468..83c55181ada4 100644
--- a/cmd/devp2p/internal/ethtest/chain.go
+++ b/cmd/devp2p/internal/ethtest/chain.go
@@ -129,10 +129,7 @@ func loadChain(chainfile string, genesis string) (*Chain, error) {
 	if err != nil {
 		return nil, err
 	}
-	gblock, err := gen.ToBlock(nil)
-	if err != nil {
-		return nil, err
-	}
+	gblock := gen.ToBlock(nil)
 
 	blocks, err := blocksFromFile(chainfile, gblock)
 	if err != nil {
@@ -183,6 +180,5 @@ func blocksFromFile(chainfile string, gblock *types.Block) ([]*types.Block, erro
 		}
 		blocks = append(blocks, &b)
 	}
-
 	return blocks, nil
 }
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
index 1058f49c8ca7..4063767cb8f4 100644
--- a/cmd/evm/runner.go
+++ b/cmd/evm/runner.go
@@ -136,14 +136,8 @@ func runCmd(ctx *cli.Context) error {
 		gen := readGenesis(ctx.GlobalString(GenesisFlag.Name))
 		genesisConfig = gen
 		db := rawdb.NewMemoryDatabase()
-		genesis, err := gen.ToBlock(db)
-		if err != nil {
-			return err
-		}
-		statedb, err = state.New(genesis.Root(), state.NewDatabase(db), nil)
-		if err != nil {
-			return err
-		}
+		genesis := gen.ToBlock(db)
+		statedb, _ = state.New(genesis.Root(), state.NewDatabase(db), nil)
 		chainConfig = gen.Config
 	} else {
 		statedb, _ = state.New(common.Hash{}, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
index 02ac4de4d042..bb5375384f89 100644
--- a/cmd/faucet/faucet.go
+++ b/cmd/faucet/faucet.go
@@ -251,11 +251,7 @@ func newFaucet(genesis *core.Genesis, port int, enodes []*enode.Node, network ui
 	cfg.SyncMode = downloader.LightSync
 	cfg.NetworkId = network
 	cfg.Genesis = genesis
-	gblock, err := genesis.ToBlock(nil)
-	if err != nil {
-		return nil, err
-	}
-	utils.SetDNSDiscoveryDefaults(&cfg, gblock.Hash())
+	utils.SetDNSDiscoveryDefaults(&cfg, genesis.ToBlock(nil).Hash())
 
 	lesBackend, err := les.New(stack, &cfg)
 	if err != nil {
diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go
index c4080c1f7e91..039ba919bf8d 100644
--- a/consensus/clique/snapshot_test.go
+++ b/consensus/clique/snapshot_test.go
@@ -412,8 +412,7 @@ func TestClique(t *testing.T) {
 		engine := New(config.Clique, db)
 		engine.fakeDiff = true
 
-		gblock, _ := genesis.ToBlock(db)
-		blocks, _ := core.GenerateChain(&config, gblock, engine, db, len(tt.votes), func(j int, gen *core.BlockGen) {
+		blocks, _ := core.GenerateChain(&config, genesis.ToBlock(db), engine, db, len(tt.votes), func(j int, gen *core.BlockGen) {
 			// Cast the vote contained in this block
 			gen.SetCoinbase(accounts.address(tt.votes[j].voted))
 			if tt.votes[j].auth {
diff --git a/core/genesis.go b/core/genesis.go
index c6a94c260e20..d5246429472e 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -183,11 +183,7 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, override
 			genesis = DefaultGenesisBlock()
 		}
 		// Ensure the stored genesis matches with the given one.
-		gBlock, err := genesis.ToBlock(nil)
-		if err != nil {
-			return genesis.Config, common.Hash{}, err
-		}
-		hash := gBlock.Hash()
+		hash := genesis.ToBlock(nil).Hash()
 		if hash != stored {
 			return genesis.Config, hash, &GenesisMismatchError{stored, hash}
 		}
@@ -199,11 +195,7 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, override
 	}
 	// Check whether the genesis block is already written.
 	if genesis != nil {
-		gBlock, err := genesis.ToBlock(nil)
-		if err != nil {
-			return genesis.Config, common.Hash{}, err
-		}
-		hash := gBlock.Hash()
+		hash := genesis.ToBlock(nil).Hash()
 		if hash != stored {
 			return genesis.Config, hash, &GenesisMismatchError{stored, hash}
 		}
@@ -263,13 +255,13 @@ func (g *Genesis) configOrDefault(ghash common.Hash) *params.ChainConfig {
 
 // ToBlock creates the genesis block and writes state of a genesis specification
 // to the given database (or discards it if nil).
-func (g *Genesis) ToBlock(db ethdb.Database) (*types.Block, error) {
+func (g *Genesis) ToBlock(db ethdb.Database) *types.Block {
 	if db == nil {
 		db = rawdb.NewMemoryDatabase()
 	}
 	statedb, err := state.New(common.Hash{}, state.NewDatabase(db), nil)
 	if err != nil {
-		return nil, err
+		panic(err)
 	}
 	for addr, account := range g.Alloc {
 		statedb.AddBalance(addr, account.Balance)
@@ -302,16 +294,13 @@ func (g *Genesis) ToBlock(db ethdb.Database) (*types.Block, error) {
 	statedb.Commit(false)
 	statedb.Database().TrieDB().Commit(root, true, nil)
 
-	return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil)), nil
+	return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil))
 }
 
 // Commit writes the block and state of a genesis specification to the database.
 // The block is committed as the canonical head block.
 func (g *Genesis) Commit(db ethdb.Database) (*types.Block, error) {
-	block, err := g.ToBlock(db)
-	if err != nil {
-		return nil, err
-	}
+	block := g.ToBlock(db)
 	if block.Number().Sign() != 0 {
 		return nil, fmt.Errorf("can't commit genesis block with number > 0")
 	}
diff --git a/core/genesis_test.go b/core/genesis_test.go
index 50fa7e0071f8..44c1ef253ac7 100644
--- a/core/genesis_test.go
+++ b/core/genesis_test.go
@@ -31,17 +31,11 @@ import (
 )
 
 func TestDefaultGenesisBlock(t *testing.T) {
-	block, err := DefaultGenesisBlock().ToBlock(nil)
-	if err != nil {
-		t.Fatalf("error getting genesis block: %v", err)
-	}
+	block := DefaultGenesisBlock().ToBlock(nil)
 	if block.Hash() != params.MainnetGenesisHash {
 		t.Errorf("wrong mainnet genesis hash, got %v, want %v", block.Hash(), params.MainnetGenesisHash)
 	}
-	block, err = DefaultRopstenGenesisBlock().ToBlock(nil)
-	if err != nil {
-		t.Fatalf("error getting ropsten genesis block: %v", err)
-	}
+	block = DefaultRopstenGenesisBlock().ToBlock(nil)
 	if block.Hash() != params.RopstenGenesisHash {
 		t.Errorf("wrong ropsten genesis hash, got %v, want %v", block.Hash(), params.RopstenGenesisHash)
 	}
diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go
index 85bc8fce36b3..b8a6e43fcd13 100644
--- a/eth/catalyst/api_test.go
+++ b/eth/catalyst/api_test.go
@@ -54,7 +54,7 @@ func generateTestChain() (*core.Genesis, []*types.Block) {
 		g.OffsetTime(5)
 		g.SetExtra([]byte("test"))
 	}
-	gblock, _ := genesis.ToBlock(db)
+	gblock := genesis.ToBlock(db)
 	engine := ethash.NewFaker()
 	blocks, _ := core.GenerateChain(config, gblock, engine, db, 10, generate)
 	blocks = append([]*types.Block{gblock}, blocks...)
@@ -95,7 +95,7 @@ func generateTestChainWithFork(n int, fork int) (*core.Genesis, []*types.Block,
 		g.OffsetTime(5)
 		g.SetExtra([]byte("testF"))
 	}
-	gblock, _ := genesis.ToBlock(db)
+	gblock := genesis.ToBlock(db)
 	engine := ethash.NewFaker()
 	blocks, _ := core.GenerateChain(config, gblock, engine, db, n, generate)
 	blocks = append([]*types.Block{gblock}, blocks...)
diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go
index feb87d35db46..9fa5bf87a493 100644
--- a/ethclient/ethclient_test.go
+++ b/ethclient/ethclient_test.go
@@ -225,7 +225,7 @@ func generateTestChain() (*core.Genesis, []*types.Block) {
 		g.OffsetTime(5)
 		g.SetExtra([]byte("test"))
 	}
-	gblock, _ := genesis.ToBlock(db)
+	gblock := genesis.ToBlock(db)
 	engine := ethash.NewFaker()
 	blocks, _ := core.GenerateChain(config, gblock, engine, db, 1, generate)
 	blocks = append([]*types.Block{gblock}, blocks...)
diff --git a/les/peer_test.go b/les/peer_test.go
index 7c2b2abf65bb..d6551ce6b639 100644
--- a/les/peer_test.go
+++ b/les/peer_test.go
@@ -100,8 +100,7 @@ type fakeChain struct{}
 
 func (f *fakeChain) Config() *params.ChainConfig { return params.MainnetChainConfig }
 func (f *fakeChain) Genesis() *types.Block {
-	block, _ := core.DefaultGenesisBlock().ToBlock(rawdb.NewMemoryDatabase())
-	return block
+	return core.DefaultGenesisBlock().ToBlock(rawdb.NewMemoryDatabase())
 }
 func (f *fakeChain) CurrentHeader() *types.Header { return &types.Header{Number: big.NewInt(10000000)} }
 
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index ea342304e864..46834de6daeb 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -174,10 +174,7 @@ func (t *StateTest) RunNoVerify(subtest StateSubtest, vmconfig vm.Config, snapsh
 		return nil, nil, common.Hash{}, UnsupportedForkError{subtest.Fork}
 	}
 	vmconfig.ExtraEips = eips
-	block, err := t.genesis(config).ToBlock(nil)
-	if err != nil {
-		return nil, nil, common.Hash{}, err
-	}
+	block := t.genesis(config).ToBlock(nil)
 	snaps, statedb := MakePreState(rawdb.NewMemoryDatabase(), t.json.Pre, snapshotter)
 
 	post := t.json.Post[subtest.Fork][subtest.Index]