From baea8e87e5dfdcfb7b2fdcef48fa6038d60a6f9c Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Thu, 18 Jun 2015 22:27:44 +0200
Subject: [PATCH] Rebase cleanup
---
tests/init.go | 29 -----------------------------
tests/vm_test_util.go | 2 +-
2 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/tests/init.go b/tests/init.go
index 326387341..9fe98a0d1 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -8,8 +8,6 @@ import (
"net/http"
"os"
"path/filepath"
-
- // "github.com/ethereum/go-ethereum/logger/glog"
)
var (
@@ -25,33 +23,6 @@ var (
VmSkipTests = []string{}
)
-// type TestRunner interface {
-// // LoadTest()
-// RunTest() error
-// }
-
-// func RunTests(bt map[string]TestRunner, skipTests []string) error {
-// // map skipped tests to boolean set
-// skipTest := make(map[string]bool, len(skipTests))
-// for _, name := range skipTests {
-// skipTest[name] = true
-// }
-
-// for name, test := range bt {
-// // if the test should be skipped, return
-// if skipTest[name] {
-// glog.Infoln("Skipping block test", name)
-// return nil
-// }
-// // test the block
-// if err := test.RunTest(); err != nil {
-// return err
-// }
-// glog.Infoln("Block test passed: ", name)
-// }
-// return nil
-// }
-
func readJson(reader io.Reader, value interface{}) error {
data, err := ioutil.ReadAll(reader)
if err != nil {
diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go
index f7f1198ec..9fccafd8e 100644
--- a/tests/vm_test_util.go
+++ b/tests/vm_test_util.go
@@ -130,7 +130,7 @@ func runVmTest(test VmTest) error {
vexp := common.HexToHash(value)
if v != vexp {
- return fmt.Errorf("(%x: %s) storage failed. Expected %x, got %x (%v %v)\n", obj.Address().Bytes()[0:4], addr, vexp, v, vexp.BigD(vexp), v.Big(v))
+ return fmt.Errorf("(%x: %s) storage failed. Expected %x, got %x (%v %v)\n", obj.Address().Bytes()[0:4], addr, vexp, v, vexp.Big(), v.Big())
}
}
}
--
GitLab