Cleanup/reorg

1 files changed, 8 insertions, 13 deletions

diff --git a/tests/init.go b/tests/init.go
index 4a176698f..e6644ae60 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -1,25 +1,21 @@
 package tests
 
 import (
-	"bytes"
 	"encoding/json"
-	"fmt"
 	"io"
 	"io/ioutil"
-	// "log"
 	"net/http"
 	"os"
-
-	// logpkg "github.com/ethereum/go-ethereum/logger"
+	"path/filepath"
 )
 
-// var Logger *logpkg.StdLogSystem
-// var Log = logpkg.NewLogger("TEST")
-
-// func init() {
-// 	Logger = logpkg.NewStdLogSystem(os.Stdout, log.LstdFlags, logpkg.InfoLevel)
-// 	logpkg.AddLogSystem(Logger)
-// }
+var (
+	baseDir            = filepath.Join(".", "files")
+	blockTestDir       = filepath.Join(baseDir, "BlockTests")
+	stateTestDir       = filepath.Join(baseDir, "StateTests")
+	transactionTestDir = filepath.Join(baseDir, "TransactionTests")
+	vmTestDir          = filepath.Join(baseDir, "VMTests")
+)
 
 func readJSON(reader io.Reader, value interface{}) error {
 	data, err := ioutil.ReadAll(reader)
@@ -57,4 +53,3 @@ func CreateFileTests(fn string, value interface{}) error {
 	}
 	return nil
 }
-}