aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-10-29 22:21:26 +0800
committerGitHub <noreply@github.com>2016-10-29 22:21:26 +0800
commit63d293cdbe14cf00045b888522ef36d21c907c26 (patch)
treedc2251251b9bd72eac05ebdf17b146788c148ae7 /cmd/geth
parent79789af2e7fce8807d21a8eedbf42d41a7c55848 (diff)
parentf0dbec0c93a772b0f3553399126d8c49bfcc85d4 (diff)
downloadgo-tangerine-63d293cdbe14cf00045b888522ef36d21c907c26.tar
go-tangerine-63d293cdbe14cf00045b888522ef36d21c907c26.tar.gz
go-tangerine-63d293cdbe14cf00045b888522ef36d21c907c26.tar.bz2
go-tangerine-63d293cdbe14cf00045b888522ef36d21c907c26.tar.lz
go-tangerine-63d293cdbe14cf00045b888522ef36d21c907c26.tar.xz
go-tangerine-63d293cdbe14cf00045b888522ef36d21c907c26.tar.zst
go-tangerine-63d293cdbe14cf00045b888522ef36d21c907c26.zip
Merge pull request #3195 from karalabe/fix-testnet-fastsync
cmd/utils, core, params: explicitly pick reprice fork for fast sync
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/dao_test.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go
index 59730b17f..56e77ba0b 100644
--- a/cmd/geth/dao_test.go
+++ b/cmd/geth/dao_test.go
@@ -116,19 +116,19 @@ func TestDAOInitOldPrivnet(t *testing.T) {
testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{}, nil, false)
}
func TestDAODefaultOldPrivnet(t *testing.T) {
- testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, false}}, params.MainNetDAOForkBlock, true)
+ testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, false}}, nil, false)
}
func TestDAOSupportOldPrivnet(t *testing.T) {
- testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{true, false}}, params.MainNetDAOForkBlock, true)
+ testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{true, false}}, nil, true)
}
func TestDAOOpposeOldPrivnet(t *testing.T) {
- testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, true}}, params.MainNetDAOForkBlock, false)
+ testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, true}}, nil, false)
}
func TestDAOSwitchToSupportOldPrivnet(t *testing.T) {
- testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, true}, {true, false}}, params.MainNetDAOForkBlock, true)
+ testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, true}, {true, false}}, nil, true)
}
func TestDAOSwitchToOpposeOldPrivnet(t *testing.T) {
- testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{true, false}, {false, true}}, params.MainNetDAOForkBlock, false)
+ testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{true, false}, {false, true}}, nil, false)
}
func TestDAOInitNoForkPrivnet(t *testing.T) {
testDAOForkBlockNewChain(t, false, daoNoForkGenesis, [][2]bool{}, daoGenesisForkBlock, false)