diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-26 04:13:27 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-26 04:13:27 +0800 |
| commit | e86233abc9fefc58f52d8a7d9990ddbf8cfda02d (patch) | |
| tree | 3a8ad9acc57bc63c3f14c14911df900ed264d759 /core/genesis.go | |
| parent | 73a576c9af5038366f50509136a91a86d203fc6b (diff) | |
| parent | c1c895a36b420d58431cf483bd3ed602227892fc (diff) | |
| download | go-tangerine-e86233abc9fefc58f52d8a7d9990ddbf8cfda02d.tar.gz go-tangerine-e86233abc9fefc58f52d8a7d9990ddbf8cfda02d.tar.zst go-tangerine-e86233abc9fefc58f52d8a7d9990ddbf8cfda02d.zip | |
Merge pull request #1525 from obscuren/genesis-write-fix
core: fixed genesis write out to write only canon number
Diffstat (limited to 'core/genesis.go')
| -rw-r--r-- | core/genesis.go | 9 |
1 files changed, 8 insertions, 1 deletions
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() |