From 8f12d76a4723ba011d033533871a0e06e1243d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 4 Jul 2017 12:28:58 +0300 Subject: params: remove redundant consts, disable metro on AllProtocolChanges --- cmd/geth/dao_test.go | 2 +- cmd/swarm/main.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index 8cc66aabf..a8dbc5163 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -89,7 +89,7 @@ func TestDAOForkBlockNewChain(t *testing.T) { expectVote bool }{ // Test DAO Default Mainnet - {"", params.MainNetDAOForkBlock, true}, + {"", params.MainnetChainConfig.DAOForkBlock, true}, // test DAO Init Old Privnet {daoOldGenesis, nil, false}, // test DAO Default No Fork Privnet diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 6b4feb0bc..4ae06a1c9 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -380,11 +380,11 @@ func detectEnsAddr(client *rpc.Client) (common.Address, error) { switch { - case version == "1" && block.Hash() == params.MainNetGenesisHash: + case version == "1" && block.Hash() == params.MainnetGenesisHash: log.Info("using Mainnet ENS contract address", "addr", ens.MainNetAddress) return ens.MainNetAddress, nil - case version == "3" && block.Hash() == params.TestNetGenesisHash: + case version == "3" && block.Hash() == params.TestnetGenesisHash: log.Info("using Testnet ENS contract address", "addr", ens.TestNetAddress) return ens.TestNetAddress, nil -- cgit v1.2.3