From c25231d6b25ffa1e03a1143d89357b52851b5c08 Mon Sep 17 00:00:00 2001
From: oysheng <33340252+oysheng@users.noreply.github.com>
Date: Fri, 12 Jul 2019 15:40:47 +0800
Subject: [PATCH] modify params (#269)

* modify params

* optimise
---
 cmd/vapord/commands/init.go | 4 +++-
 config/genesis.go           | 7 +++----
 docker/vapord/config.toml   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cmd/vapord/commands/init.go b/cmd/vapord/commands/init.go
index 4003047e..115c54fa 100644
--- a/cmd/vapord/commands/init.go
+++ b/cmd/vapord/commands/init.go
@@ -32,7 +32,9 @@ func initFiles(cmd *cobra.Command, args []string) {
 	}
 
 	switch config.ChainID {
-	case "vapor":
+	case "mainnet":
+		cfg.EnsureRoot(config.RootDir, config.ChainID)
+	case "testnet":
 		cfg.EnsureRoot(config.RootDir, config.ChainID)
 	default:
 		cfg.EnsureRoot(config.RootDir, "solonet")
diff --git a/config/genesis.go b/config/genesis.go
index 00c186de..aabb430b 100644
--- a/config/genesis.go
+++ b/config/genesis.go
@@ -150,9 +150,8 @@ func soloNetGenesisBlock() *types.Block {
 // GenesisBlock will return genesis block
 func GenesisBlock() *types.Block {
 	return map[string]func() *types.Block{
-		"main":  mainNetGenesisBlock,
-		"test":  testNetGenesisBlock,
-		"solo":  soloNetGenesisBlock,
-		"vapor": soloNetGenesisBlock,
+		"main": mainNetGenesisBlock,
+		"test": testNetGenesisBlock,
+		"solo": soloNetGenesisBlock,
 	}[consensus.ActiveNetParams.Name]()
 }
diff --git a/docker/vapord/config.toml b/docker/vapord/config.toml
index 0b8a3539..8aae6096 100644
--- a/docker/vapord/config.toml
+++ b/docker/vapord/config.toml
@@ -4,7 +4,7 @@ fast_sync = true
 db_backend = "leveldb"
 api_addr = "0.0.0.0:9889"
 moniker = ""
-chain_id = "vapor"
+chain_id = "mainnet"
 [p2p]
 laddr = "tcp://0.0.0.0:56659"
 seeds = "52.83.133.152:56659"
-- 
2.11.0