From c1c895a36b420d58431cf483bd3ed602227892fc Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Sat, 25 Jul 2015 21:48:53 +0200 Subject: core: fixed genesis write out to write only canon number --- core/genesis.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'core/genesis.go') diff --git a/core/genesis.go b/core/genesis.go index a88e88ea8..2f218724a 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -27,6 +27,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/params" ) @@ -83,7 +85,12 @@ func WriteGenesisBlock(stateDb, blockDb common.Database, reader io.Reader) (*typ block.Td = difficulty if block := GetBlockByHash(blockDb, block.Hash()); block != nil { - return nil, fmt.Errorf("Block %x already in database", block.Hash()) + glog.V(logger.Info).Infoln("Genesis block already in chain. Writing canonical number") + err := WriteCanonNumber(blockDb, block) + if err != nil { + return nil, err + } + return block, nil } statedb.Sync() -- cgit v1.2.3