From 200f66537cdf21a69ddda74eedfee30c14fb6ba6 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 2 Mar 2015 17:55:45 +0100
Subject: updated tests

---
 tests/vm/gh_test.go | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

(limited to 'tests/vm')

diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
index 2151cf9a5..a23076b74 100644
--- a/tests/vm/gh_test.go
+++ b/tests/vm/gh_test.go
@@ -79,10 +79,12 @@ func RunVmTest(p string, t *testing.T) {
 	helper.CreateFileTests(t, p, &tests)
 
 	for name, test := range tests {
-		helper.Logger.SetLogLevel(4)
-		if name != "TransactionNonceCheck2" {
-			continue
-		}
+		/*
+			helper.Logger.SetLogLevel(4)
+			if name != "log1_nonEmptyMem_logMemSize1_logMemStart31" {
+				continue
+			}
+		*/
 		db, _ := ethdb.NewMemDatabase()
 		statedb := state.New(nil, db)
 		for addr, account := range test.Pre {
@@ -159,10 +161,14 @@ func RunVmTest(p string, t *testing.T) {
 		}
 
 		if len(test.Logs) > 0 {
-			for i, log := range test.Logs {
-				genBloom := ethutil.LeftPadBytes(types.LogsBloom(state.Logs{logs[i]}).Bytes(), 64)
-				if !bytes.Equal(genBloom, ethutil.Hex2Bytes(log.BloomF)) {
-					t.Errorf("bloom mismatch")
+			if len(test.Logs) != len(logs) {
+				t.Errorf("log length mismatch. Expected %d, got %d", len(test.Logs), len(logs))
+			} else {
+				for i, log := range test.Logs {
+					genBloom := ethutil.LeftPadBytes(types.LogsBloom(state.Logs{logs[i]}).Bytes(), 64)
+					if !bytes.Equal(genBloom, ethutil.Hex2Bytes(log.BloomF)) {
+						t.Errorf("bloom mismatch")
+					}
 				}
 			}
 		}
@@ -176,11 +182,6 @@ func TestVMArithmetic(t *testing.T) {
 	RunVmTest(fn, t)
 }
 
-func TestSystemOperations(t *testing.T) {
-	const fn = "../files/VMTests/vmSystemOperationsTest.json"
-	RunVmTest(fn, t)
-}
-
 func TestBitwiseLogicOperation(t *testing.T) {
 	const fn = "../files/VMTests/vmBitwiseLogicOperationTest.json"
 	RunVmTest(fn, t)
@@ -201,6 +202,17 @@ func TestFlowOperation(t *testing.T) {
 	RunVmTest(fn, t)
 }
 
+func TestLogTest(t *testing.T) {
+	const fn = "../files/VMTests/vmLogTest.json"
+	RunVmTest(fn, t)
+}
+
+func TestPerformance(t *testing.T) {
+	t.Skip()
+	const fn = "../files/VMTests/vmPerformance.json"
+	RunVmTest(fn, t)
+}
+
 func TestPushDupSwap(t *testing.T) {
 	const fn = "../files/VMTests/vmPushDupSwapTest.json"
 	RunVmTest(fn, t)
-- 
cgit