diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-25 23:36:04 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-25 23:36:04 +0800 |
| commit | 0efcd7ed05331c25b3f3d485c65354cfe99d8297 (patch) | |
| tree | 9fb7530609c5e38666185521dab7349f6a6526f8 /core | |
| parent | 4019e2a6f2671cb812fab4754dfc5bf274a7b81b (diff) | |
| parent | 036e6301af123ddc7d33f45545bdc083d1573bd8 (diff) | |
| download | dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.tar.gz dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.tar.zst dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.zip | |
Merge pull request #1521 from obscuren/client-update
cmd/geth, core, eth: Version 1.0.0
Diffstat (limited to 'core')
| -rw-r--r-- | core/chain_makers_test.go | 3 | ||||
| -rw-r--r-- | core/chain_manager.go | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 715e4c7ac..deb8be93f 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -28,6 +28,9 @@ import ( ) func ExampleGenerateChain() { + params.MinGasLimit = big.NewInt(125000) // Minimum the gas limit may ever be. + params.GenesisGasLimit = big.NewInt(3141592) // Gas limit of the Genesis block. + var ( key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") key2, _ = crypto.HexToECDSA("8a1f9a8f95be41cd7ccb6168179afb4504aefe388d1e14474d32c45c72ce7b7a") diff --git a/core/chain_manager.go b/core/chain_manager.go index 0f008dfa7..5c132a668 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -98,13 +98,7 @@ func NewChainManager(blockDb, stateDb, extraDb common.Database, pow pow.PoW, mux bc.genesisBlock = bc.GetBlockByNumber(0) if bc.genesisBlock == nil { - // XXX Uncomment me before Frontier - //return nil, ErrNoGenesis - genesis, err := WriteTestNetGenesisBlock(bc.stateDb, bc.blockDb, 42) - if err != nil { - glog.Fatalln("genisis err", err) - } - bc.genesisBlock = genesis + return nil, ErrNoGenesis } if err := bc.setLastState(); err != nil { |