aboutsummaryrefslogtreecommitdiffstats
path: root/core/database_util_test.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2016-02-29 22:05:37 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2016-02-29 22:05:37 +0800
commit4044a8cea44cd4cee3a8ddaf51a76b71c9d22042 (patch)
tree1aa3776381e8e117b66e4a8ed1bf83e29d966ff1 /core/database_util_test.go
parentc541b38fb36587d23c60f5e2f2b9b3c8700ec489 (diff)
parent61be63bb9b8527bb3e2357ad35a0f4ef29304da1 (diff)
downloadgo-tangerine-4044a8cea44cd4cee3a8ddaf51a76b71c9d22042.tar
go-tangerine-4044a8cea44cd4cee3a8ddaf51a76b71c9d22042.tar.gz
go-tangerine-4044a8cea44cd4cee3a8ddaf51a76b71c9d22042.tar.bz2
go-tangerine-4044a8cea44cd4cee3a8ddaf51a76b71c9d22042.tar.lz
go-tangerine-4044a8cea44cd4cee3a8ddaf51a76b71c9d22042.tar.xz
go-tangerine-4044a8cea44cd4cee3a8ddaf51a76b71c9d22042.tar.zst
go-tangerine-4044a8cea44cd4cee3a8ddaf51a76b71c9d22042.zip
Merge pull request #2258 from obscuren/release/1.3.4v1.3.4
Homestead Release Candidate
Diffstat (limited to 'core/database_util_test.go')
-rw-r--r--core/database_util_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/database_util_test.go b/core/database_util_test.go
index 059f1ae9f..6b3793635 100644
--- a/core/database_util_test.go
+++ b/core/database_util_test.go
@@ -62,7 +62,7 @@ func (d *diffTest) UnmarshalJSON(b []byte) (err error) {
return nil
}
-func TestDifficulty(t *testing.T) {
+func TestDifficultyFrontier(t *testing.T) {
file, err := os.Open("../tests/files/BasicTests/difficulty.json")
if err != nil {
t.Fatal(err)
@@ -77,7 +77,7 @@ func TestDifficulty(t *testing.T) {
for name, test := range tests {
number := new(big.Int).Sub(test.CurrentBlocknumber, big.NewInt(1))
- diff := CalcDifficulty(test.CurrentTimestamp, test.ParentTimestamp, number, test.ParentDifficulty)
+ diff := calcDifficultyFrontier(test.CurrentTimestamp, test.ParentTimestamp, number, test.ParentDifficulty)
if diff.Cmp(test.CurrentDifficulty) != 0 {
t.Error(name, "failed. Expected", test.CurrentDifficulty, "and calculated", diff)
}