diff options
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/chaincmd.go | 3 | ||||
| -rw-r--r-- | cmd/geth/dao_test.go | 5 | ||||
| -rw-r--r-- | cmd/geth/main.go | 5 |
3 files changed, 3 insertions, 10 deletions
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 19e723bfa..1a7a9eb18 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -99,9 +99,6 @@ func importChain(ctx *cli.Context) error { if len(ctx.Args()) != 1 { utils.Fatalf("This command requires an argument.") } - if ctx.GlobalBool(utils.TestNetFlag.Name) { - state.StartingNonce = 1048576 // (2**20) - } stack := makeFullNode(ctx) chain, chainDb := utils.MakeChain(ctx, stack) defer chainDb.Close() diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index f90bb182d..06578b612 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -191,14 +191,15 @@ func testDAOForkBlockNewChain(t *testing.T, testnet bool, genesis string, votes genesisHash := common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3") if testnet { - genesisHash = common.HexToHash("0x0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303") + genesisHash = common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d") } if genesis != "" { genesisHash = daoGenesisHash } config, err := core.GetChainConfig(db, genesisHash) if err != nil { - t.Fatalf("failed to retrieve chain config: %v", err) + t.Errorf("failed to retrieve chain config: %v", err) + return // we want to return here, the other checks can't make it past this point (nil panic). } // Validate the DAO hard-fork block number against the expected value if config.DAOForkBlock == nil { diff --git a/cmd/geth/main.go b/cmd/geth/main.go index e1d0b84c8..a275d8aa5 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -34,7 +34,6 @@ import ( "github.com/ethereum/go-ethereum/console" "github.com/ethereum/go-ethereum/contracts/release" "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/internal/debug" "github.com/ethereum/go-ethereum/logger" @@ -238,10 +237,6 @@ func initGenesis(ctx *cli.Context) error { utils.Fatalf("must supply path to genesis JSON file") } - if ctx.GlobalBool(utils.TestNetFlag.Name) { - state.StartingNonce = 1048576 // (2**20) - } - stack := makeFullNode(ctx) chaindb := utils.MakeChainDatabase(ctx, stack) |