aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
authorBas van Kervel <basvankervel@gmail.com>2017-01-09 19:09:37 +0800
committerBas van Kervel <basvankervel@gmail.com>2017-01-12 16:50:54 +0800
commit745a3adebd9f98e9d53a7d07519d415b55fa5d1f (patch)
tree13ca74c80dcf6f529999e8bf23ef5f1daa322458 /cmd/utils
parent218ec6c0856caaff70df8e318e035c4ed8c97820 (diff)
downloadgo-tangerine-745a3adebd9f98e9d53a7d07519d415b55fa5d1f.tar
go-tangerine-745a3adebd9f98e9d53a7d07519d415b55fa5d1f.tar.gz
go-tangerine-745a3adebd9f98e9d53a7d07519d415b55fa5d1f.tar.bz2
go-tangerine-745a3adebd9f98e9d53a7d07519d415b55fa5d1f.tar.lz
go-tangerine-745a3adebd9f98e9d53a7d07519d415b55fa5d1f.tar.xz
go-tangerine-745a3adebd9f98e9d53a7d07519d415b55fa5d1f.tar.zst
go-tangerine-745a3adebd9f98e9d53a7d07519d415b55fa5d1f.zip
core: remove support for Olympic network
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/flags.go34
1 files changed, 3 insertions, 31 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 5092616de..01114a957 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -21,7 +21,6 @@ import (
"crypto/ecdsa"
"fmt"
"io/ioutil"
- "math"
"math/big"
"os"
"path/filepath"
@@ -116,13 +115,9 @@ var (
}
NetworkIdFlag = cli.IntFlag{
Name: "networkid",
- Usage: "Network identifier (integer, 0=Olympic (disused), 1=Frontier, 2=Morden (disused), 3=Ropsten)",
+ Usage: "Network identifier (integer, 1=Frontier, 2=Morden (disused), 3=Ropsten)",
Value: eth.NetworkId,
}
- OlympicFlag = cli.BoolFlag{
- Name: "olympic",
- Usage: "Olympic network: pre-configured pre-release test network",
- }
TestNetFlag = cli.BoolFlag{
Name: "testnet",
Usage: "Ropsten network: pre-configured test network",
@@ -712,7 +707,7 @@ func MakeNode(ctx *cli.Context, name, gitCommit string) *node.Node {
// given node.
func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
// Avoid conflicting network flags
- networks, netFlags := 0, []cli.BoolFlag{DevModeFlag, TestNetFlag, OlympicFlag}
+ networks, netFlags := 0, []cli.BoolFlag{DevModeFlag, TestNetFlag}
for _, flag := range netFlags {
if ctx.GlobalBool(flag.Name) {
networks++
@@ -750,12 +745,6 @@ func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
// Override any default configs in dev mode or the test net
switch {
- case ctx.GlobalBool(OlympicFlag.Name):
- if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
- ethConf.NetworkId = 1
- }
- ethConf.Genesis = core.OlympicGenesisBlock()
-
case ctx.GlobalBool(TestNetFlag.Name):
if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
ethConf.NetworkId = 3
@@ -763,7 +752,7 @@ func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
ethConf.Genesis = core.DefaultTestnetGenesisBlock()
case ctx.GlobalBool(DevModeFlag.Name):
- ethConf.Genesis = core.OlympicGenesisBlock()
+ ethConf.Genesis = core.DevGenesisBlock()
if !ctx.GlobalIsSet(GasPriceFlag.Name) {
ethConf.GasPrice = new(big.Int)
}
@@ -820,16 +809,6 @@ func RegisterEthStatsService(stack *node.Node, url string) {
// SetupNetwork configures the system for either the main net or some test network.
func SetupNetwork(ctx *cli.Context) {
- switch {
- case ctx.GlobalBool(OlympicFlag.Name):
- params.DurationLimit = big.NewInt(8)
- params.GenesisGasLimit = big.NewInt(3141592)
- params.MinGasLimit = big.NewInt(125000)
- params.MaximumExtraDataSize = big.NewInt(1024)
- NetworkIdFlag.Value = 0
- core.BlockReward = big.NewInt(1.5e+18)
- core.ExpDiffPeriod = big.NewInt(math.MaxInt64)
- }
params.TargetGasLimit = common.String2Big(ctx.GlobalString(TargetGasLimitFlag.Name))
}
@@ -920,13 +899,6 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
var err error
chainDb = MakeChainDatabase(ctx, stack)
- if ctx.GlobalBool(OlympicFlag.Name) {
- _, err := core.WriteOlympicGenesisBlock(chainDb)
- if err != nil {
- glog.Fatalln(err)
- }
- }
-
if ctx.GlobalBool(TestNetFlag.Name) {
_, err := core.WriteTestNetGenesisBlock(chainDb)
if err != nil {