aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-07-04 17:28:58 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-07-04 17:28:58 +0800
commit8f12d76a4723ba011d033533871a0e06e1243d7c (patch)
tree35805a9d44bba26188f7ad3a953c0ea25802e33d /cmd
parenta0aa071ca6f6bfd77fb57273ef5477d3aa2ac6c0 (diff)
downloaddexon-8f12d76a4723ba011d033533871a0e06e1243d7c.tar
dexon-8f12d76a4723ba011d033533871a0e06e1243d7c.tar.gz
dexon-8f12d76a4723ba011d033533871a0e06e1243d7c.tar.bz2
dexon-8f12d76a4723ba011d033533871a0e06e1243d7c.tar.lz
dexon-8f12d76a4723ba011d033533871a0e06e1243d7c.tar.xz
dexon-8f12d76a4723ba011d033533871a0e06e1243d7c.tar.zst
dexon-8f12d76a4723ba011d033533871a0e06e1243d7c.zip
params: remove redundant consts, disable metro on AllProtocolChanges
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/dao_test.go2
-rw-r--r--cmd/swarm/main.go4
2 files changed, 3 insertions, 3 deletions
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