diff --git a/eth/config.go b/eth/config.go index a84b13fba1..3732337508 100644 --- a/eth/config.go +++ b/eth/config.go @@ -35,16 +35,9 @@ import ( // DefaultConfig contains default settings for use on the Ethereum main net. var DefaultConfig = Config{ - SyncMode: downloader.FastSync, - Ethash: ethash.Config{ - CacheDir: "ethash", - CachesInMem: 2, - CachesOnDisk: 3, - DatasetsInMem: 1, - DatasetsOnDisk: 2, - }, - NetworkId: 1, - LightPeers: 100, + SyncMode: downloader.FullSync, + NetworkId: 1515, + LightPeers: 20, DatabaseCache: 768, TrieCache: 256, TrieTimeout: 60 * time.Minute, @@ -102,9 +95,6 @@ type Config struct { ExtraData []byte `toml:",omitempty"` GasPrice *big.Int - // Ethash options - Ethash ethash.Config - // Transaction pool options TxPool core.TxPoolConfig diff --git a/params/config.go b/params/config.go index 56ff8131c3..28006fdf73 100644 --- a/params/config.go +++ b/params/config.go @@ -71,7 +71,7 @@ type ChainConfig struct { ConstantinopleBlock *big.Int `json:"constantinopleBlock,omitempty"` // Constantinople switch block (nil = no fork, 0 = already activated) // Various consensus engines - LCP *LcpConfig `json:"LCP,omitempty"` + LCP *LcpConfig `json:"lcp,omitempty"` } // LCP is the consensus engine.