Merge pull request ethereum#3094 from fjl/tests-update

tests: update test files from github.com/ethereum/tests @ 45bc1d21d3c1
Komhar · Oct 6, 2016 · eeb2a1a · eeb2a1a
2 parents 7335a70 + 1b7b2ba
commit eeb2a1a
Show file tree

Hide file tree

Showing 746 changed files with 188,445 additions and 65,642 deletions.
diff --git 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 TestDifficultyFrontier(t *testing.T) {
+func TestCalcDifficulty(t *testing.T) {
 	file, err := os.Open("../tests/files/BasicTests/difficulty.json")
 	if err != nil {
 		t.Fatal(err)
@@ -75,9 +75,10 @@ func TestDifficultyFrontier(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	config := &ChainConfig{HomesteadBlock: big.NewInt(1150000)}
 	for name, test := range tests {
 		number := new(big.Int).Sub(test.CurrentBlocknumber, big.NewInt(1))
-		diff := calcDifficultyFrontier(test.CurrentTimestamp, test.ParentTimestamp, number, test.ParentDifficulty)
+		diff := CalcDifficulty(config, test.CurrentTimestamp, test.ParentTimestamp, number, test.ParentDifficulty)
 		if diff.Cmp(test.CurrentDifficulty) != 0 {
 			t.Error(name, "failed. Expected", test.CurrentDifficulty, "and calculated", diff)
 		}

diff --git a/tests/block_test.go b/tests/block_test.go
@@ -219,3 +219,22 @@ func TestDAOBcTheDao(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestHomesteadBcExploit(t *testing.T) {
+	err := RunBlockTest(big.NewInt(0), nil, filepath.Join(blockTestDir, "Homestead", "bcExploitTest.json"), BlockSkipTests)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+func TestHomesteadBcShanghaiLove(t *testing.T) {
+	err := RunBlockTest(big.NewInt(0), nil, filepath.Join(blockTestDir, "Homestead", "bcShanghaiLove.json"), BlockSkipTests)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+func TestHomesteadBcSuicideIssue(t *testing.T) {
+	err := RunBlockTest(big.NewInt(0), nil, filepath.Join(blockTestDir, "Homestead", "bcSuicideIssue.json"), BlockSkipTests)
+	if err != nil {
+		t.Fatal(err)
+	}
+}