forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix logic error: OR to use AND

Browse source
This commit is contained in:
Chris Purta 2018-07-06 16:28:51 -07:00
parent 4f926086ee
commit 68e62fa804
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
consensus/ethash/consensus.go
View file

@ -312,8 +312,8 @@ func CalcDifficulty(config *params.ChainConfig, time uint64, parent *types.Heade
// chain is a private network or not based on the configurations // chain is a private network or not based on the configurations
// ChainID. // ChainID.
func isPrivateNetwork(config *params.ChainConfig) bool { func isPrivateNetwork(config *params.ChainConfig) bool {
return config.ChainID != params.MainnetChainConfig.ChainID || return config.ChainID != params.MainnetChainConfig.ChainID &&
config.ChainID != params.TestChainConfig.ChainID || config.ChainID != params.TestChainConfig.ChainID &&
config.ChainID != params.RinkebyChainConfig.ChainID config.ChainID != params.RinkebyChainConfig.ChainID
} }