From 0acae8de1b80e8a03d76b48ce7c8f902f056bd8d Mon Sep 17 00:00:00 2001 From: Kiel barry Date: Mon, 4 Jun 2018 13:39:50 -0700 Subject: [PATCH] params: update per karalabe feedback --- params/config.go | 12 ++++++------ params/version.go | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/params/config.go b/params/config.go index 9f66c159e9..6e6a5cb8b2 100644 --- a/params/config.go +++ b/params/config.go @@ -102,7 +102,7 @@ var ( // that any network, identified by its genesis block, can have its own // set of configuration options. type ChainConfig struct { - ChainID *big.Int `json:"chainID"` // Chain id identifies the current chain and is used for replay protection + ChainID *big.Int `json:"chainId"` // chainId identifies the current chain and is used for replay protection HomesteadBlock *big.Int `json:"homesteadBlock,omitempty"` // Homestead switch block (nil = no fork, 0 = already homestead) @@ -178,27 +178,27 @@ func (c *ChainConfig) IsDAOFork(num *big.Int) bool { return isForked(c.DAOForkBlock, num) } -// IsEIP150 returns whether num is either equal to the IsEIP150 fork block or greater. +// IsEIP150 returns whether num is either equal to the EIP150 fork block or greater. func (c *ChainConfig) IsEIP150(num *big.Int) bool { return isForked(c.EIP150Block, num) } -// IsEIP155 returns whether num is either equal to the IsEIP155 fork block or greater. +// IsEIP155 returns whether num is either equal to the EIP155 fork block or greater. func (c *ChainConfig) IsEIP155(num *big.Int) bool { return isForked(c.EIP155Block, num) } -// IsEIP158 returns whether num is either equal to the IsEIP158 fork block or greater. +// IsEIP158 returns whether num is either equal to the EIP158 fork block or greater. func (c *ChainConfig) IsEIP158(num *big.Int) bool { return isForked(c.EIP158Block, num) } -// IsByzantium returns whether num is either equal to the IsByzantium fork block or greater. +// IsByzantium returns whether num is either equal to the Byzantium fork block or greater. func (c *ChainConfig) IsByzantium(num *big.Int) bool { return isForked(c.ByzantiumBlock, num) } -// IsConstantinople returns whether num is either equal to the IsConstantinople fork block or greater. +// IsConstantinople returns whether num is either equal to the Constantinople fork block or greater. func (c *ChainConfig) IsConstantinople(num *big.Int) bool { return isForked(c.ConstantinopleBlock, num) } diff --git a/params/version.go b/params/version.go index 8eca60465f..8689ccba7f 100644 --- a/params/version.go +++ b/params/version.go @@ -20,7 +20,6 @@ import ( "fmt" ) -// Version components of the current release. const ( VersionMajor = 1 // Major version component of the current release VersionMinor = 8 // Minor version component of the current release