From a32c51effda8682b292d04863aae7811f78abf7e Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Fri, 10 Jul 2015 14:29:40 +0200
Subject: cmd, core, eth, common: genesis preparation

Implemented the --genesis flag thru which we can set a custom genesis
block, including the official Ethereum genesis block.
---
 tests/block_test_util.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index e624cced0..f7c2208b3 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -160,6 +160,8 @@ func runBlockTests(bt map[string]*BlockTest, skipTests []string) error {
 }
 func runBlockTest(test *BlockTest) error {
 	cfg := test.makeEthConfig()
+	cfg.GenesisBlock = test.Genesis
+
 	ethereum, err := eth.New(cfg)
 	if err != nil {
 		return err
@@ -170,9 +172,6 @@ func runBlockTest(test *BlockTest) error {
 		return err
 	}
 
-	// import the genesis block
-	ethereum.ResetWithGenesisBlock(test.Genesis)
-
 	// import pre accounts
 	statedb, err := test.InsertPreState(ethereum)
 	if err != nil {
-- 
cgit v1.2.3