From 3b709852846317d3456f55f906afc327ba76d6df Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 16 Oct 2014 21:34:59 +0200
Subject: added eth tester

---
 tests/ethtest/main.go | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 tests/ethtest/main.go

(limited to 'tests/ethtest/main.go')

diff --git a/tests/ethtest/main.go b/tests/ethtest/main.go
new file mode 100644
index 000000000..3e85891e4
--- /dev/null
+++ b/tests/ethtest/main.go
@@ -0,0 +1,104 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"io/ioutil"
+	"log"
+	"os"
+	"strings"
+
+	"github.com/ethereum/eth-go/ethstate"
+	"github.com/ethereum/eth-go/ethutil"
+	"github.com/ethereum/eth-go/tests/helper"
+)
+
+type Account struct {
+	Balance string
+	Code    string
+	Nonce   string
+	Storage map[string]string
+}
+
+func StateObjectFromAccount(addr string, account Account) *ethstate.StateObject {
+	obj := ethstate.NewStateObject(ethutil.Hex2Bytes(addr))
+	obj.Balance = ethutil.Big(account.Balance)
+
+	if ethutil.IsHex(account.Code) {
+		account.Code = account.Code[2:]
+	}
+	obj.Code = ethutil.Hex2Bytes(account.Code)
+	obj.Nonce = ethutil.Big(account.Nonce).Uint64()
+
+	return obj
+}
+
+type VmTest struct {
+	Callcreates interface{}
+	Env         map[string]string
+	Exec        map[string]string
+	Gas         string
+	Out         string
+	Post        map[string]Account
+	Pre         map[string]Account
+}
+
+func RunVmTest(js string) (failed int) {
+	tests := make(map[string]VmTest)
+
+	data, _ := ioutil.ReadAll(strings.NewReader(js))
+	err := json.Unmarshal(data, &tests)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	for name, test := range tests {
+		state := ethstate.New(helper.NewTrie())
+		for addr, account := range test.Pre {
+			obj := StateObjectFromAccount(addr, account)
+			state.SetStateObject(obj)
+		}
+
+		ret, gas, err := helper.RunVm(state, test.Env, test.Exec)
+		// When an error is returned it doesn't always mean the tests fails.
+		// Have to come up with some conditional failing mechanism.
+		if err != nil {
+			helper.Log.Infoln(err)
+		}
+
+		rexp := helper.FromHex(test.Out)
+		if bytes.Compare(rexp, ret) != 0 {
+			log.Printf("%s's return failed. Expected %x, got %x\n", name, rexp, ret)
+			failed = 1
+		}
+
+		gexp := ethutil.Big(test.Gas)
+		if gexp.Cmp(gas) != 0 {
+			log.Printf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas)
+			failed = 1
+		}
+
+		for addr, account := range test.Post {
+			obj := state.GetStateObject(helper.FromHex(addr))
+			for addr, value := range account.Storage {
+				v := obj.GetState(helper.FromHex(addr)).Bytes()
+				vexp := helper.FromHex(value)
+
+				if bytes.Compare(v, vexp) != 0 {
+					log.Printf("%s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address()[0:4], addr, vexp, v, ethutil.BigD(vexp), ethutil.BigD(v))
+					failed = 1
+				}
+			}
+		}
+	}
+
+	return
+}
+
+func main() {
+	if len(os.Args) == 1 {
+		log.Fatalln("no json supplied")
+	}
+
+	os.Exit(RunVmTest(os.Args[1]))
+}
-- 
cgit 


From 29b8a0bc5ffa7a674a06a211e1c8bdd1b6ed07b1 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 23 Oct 2014 01:01:26 +0200
Subject: Updated the VM & VM tests

* Stack Error shouldn't revert to previous state
* Updated VM Test tool
* Added Transfer method to VM Env
---
 tests/ethtest/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/ethtest/main.go')

diff --git a/tests/ethtest/main.go b/tests/ethtest/main.go
index 3e85891e4..e19892557 100644
--- a/tests/ethtest/main.go
+++ b/tests/ethtest/main.go
@@ -22,7 +22,7 @@ type Account struct {
 
 func StateObjectFromAccount(addr string, account Account) *ethstate.StateObject {
 	obj := ethstate.NewStateObject(ethutil.Hex2Bytes(addr))
-	obj.Balance = ethutil.Big(account.Balance)
+	obj.SetBalance(ethutil.Big(account.Balance))
 
 	if ethutil.IsHex(account.Code) {
 		account.Code = account.Code[2:]
-- 
cgit 


From feef194829b07570e91873ed5d1e8cc51e8fa430 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 23 Oct 2014 14:04:00 +0200
Subject: Chnged to use GetOp instead & added error + checking

---
 tests/ethtest/main.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/ethtest/main.go')

diff --git a/tests/ethtest/main.go b/tests/ethtest/main.go
index e19892557..1f2a15e1c 100644
--- a/tests/ethtest/main.go
+++ b/tests/ethtest/main.go
@@ -63,7 +63,7 @@ func RunVmTest(js string) (failed int) {
 		// When an error is returned it doesn't always mean the tests fails.
 		// Have to come up with some conditional failing mechanism.
 		if err != nil {
-			helper.Log.Infoln(err)
+			log.Println(err)
 		}
 
 		rexp := helper.FromHex(test.Out)
@@ -96,6 +96,7 @@ func RunVmTest(js string) (failed int) {
 }
 
 func main() {
+	helper.Logger.SetLogLevel(5)
 	if len(os.Args) == 1 {
 		log.Fatalln("no json supplied")
 	}
-- 
cgit