roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Flatten helper directory

Browse Source
This commit is contained in:
Taylor Gerring 2015-06-10 13:00:54 -04:00
parent e82100367f
commit 1b26d4f220
6 changed files with 22 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/helper/common.go
View File

@ -1,11 +0,0 @@
package helper
import "github.com/ethereum/go-ethereum/common"
func FromHex(h string) []byte {
if common.IsHex(h) {
h = h[2:]
}
return common.Hex2Bytes(h)
}

16
tests/helper/init.go
View File

@ -1,16 +0,0 @@
package helper
import (
"log"
"os"
logpkg "github.com/ethereum/go-ethereum/logger"
)
var Logger *logpkg.StdLogSystem
var Log = logpkg.NewLogger("TEST")
func init() {
Logger = logpkg.NewStdLogSystem(os.Stdout, log.LstdFlags, logpkg.InfoLevel)
logpkg.AddLogSystem(Logger)
}

31
tests/helper/trie.go
View File

@ -1,31 +0,0 @@
package helper
import "github.com/ethereum/go-ethereum/trie"
type MemDatabase struct {
db map[string][]byte
}
func NewMemDatabase() (*MemDatabase, error) {
db := &MemDatabase{db: make(map[string][]byte)}
return db, nil
}
func (db *MemDatabase) Put(key []byte, value []byte) {
db.db[string(key)] = value
}
func (db *MemDatabase) Get(key []byte) ([]byte, error) {
return db.db[string(key)], nil
}
func (db *MemDatabase) Delete(key []byte) error {
delete(db.db, string(key))
return nil
}
func (db *MemDatabase) Print() {}
func (db *MemDatabase) Close() {}
func (db *MemDatabase) LastKnownTD() []byte { return nil }
func NewTrie() *trie.Trie {
db, _ := NewMemDatabase()
return trie.New(nil, db)
}

13
tests/helper/readers.go → tests/init.go
View File

@ -1,14 +1,25 @@
package helper
package tests
import (
"encoding/json"
"io"
"io/ioutil"
// "log"
"net/http"
"os"
"testing"
// logpkg "github.com/ethereum/go-ethereum/logger"
)
// var Logger *logpkg.StdLogSystem
// var Log = logpkg.NewLogger("TEST")
// func init() {
// Logger = logpkg.NewStdLogSystem(os.Stdout, log.LstdFlags, logpkg.InfoLevel)
// logpkg.AddLogSystem(Logger)
// }
func readJSON(t *testing.T, reader io.Reader, value interface{}) {
data, err := ioutil.ReadAll(reader)
err = json.Unmarshal(data, &value)

6
tests/helper/vm.go → tests/vm.go
View File

@ -1,4 +1,4 @@
package helper
package tests
import (
"errors"
@ -144,7 +144,7 @@ func RunVm(state *state.StateDB, env, exec map[string]string) ([]byte, state.Log
var (
to = common.HexToAddress(exec["address"])
from = common.HexToAddress(exec["caller"])
data = FromHex(exec["data"])
data = common.FromHex(exec["data"])
gas = common.Big(exec["gas"])
price = common.Big(exec["gasPrice"])
value = common.Big(exec["value"])
@ -166,7 +166,7 @@ func RunVm(state *state.StateDB, env, exec map[string]string) ([]byte, state.Log
func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, state.Logs, *big.Int, error) {
var (
keyPair, _ = crypto.NewKeyPairFromSec([]byte(common.Hex2Bytes(tx["secretKey"])))
data = FromHex(tx["data"])
data = common.FromHex(tx["data"])
gas = common.Big(tx["gasLimit"])
price = common.Big(tx["gasPrice"])
value = common.Big(tx["value"])

15
tests/vm_test_util.go
View File

@ -11,7 +11,6 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/tests/helper"
)
type Account struct {
@ -52,7 +51,7 @@ func StateObjectFromAccount(db common.Database, addr string, account Account) *s
return obj
}
type Env struct {
type VmEnv struct {
CurrentCoinbase string
CurrentDifficulty string
CurrentGasLimit string
@ -64,7 +63,7 @@ type Env struct {
type VmTest struct {
Callcreates interface{}
//Env map[string]string
Env Env
Env VmEnv
Exec map[string]string
Transaction map[string]string
Logs []Log
@ -78,7 +77,7 @@ type VmTest struct {
func RunVmTest(p string, t *testing.T) {
tests := make(map[string]VmTest)
helper.CreateFileTests(t, p, &tests)
CreateFileTests(t, p, &tests)
for name, test := range tests {
/*
@ -121,9 +120,9 @@ func RunVmTest(p string, t *testing.T) {
isVmTest := len(test.Exec) > 0
if isVmTest {
ret, logs, gas, err = helper.RunVm(statedb, env, test.Exec)
ret, logs, gas, err = RunVm(statedb, env, test.Exec)
} else {
ret, logs, gas, err = helper.RunState(statedb, env, test.Transaction)
ret, logs, gas, err = RunState(statedb, env, test.Transaction)
}
switch name {
@ -131,7 +130,7 @@ func RunVmTest(p string, t *testing.T) {
// on 19 May 2015 decided to skip these tests their output.
case "mload32bitBound_return", "mload32bitBound_return2":
default:
rexp := helper.FromHex(test.Out)
rexp := common.FromHex(test.Out)
if bytes.Compare(rexp, ret) != 0 {
t.Errorf("%s's return failed. Expected %x, got %x\n", name, rexp, ret)
}
@ -192,7 +191,7 @@ func RunVmTest(p string, t *testing.T) {
t.Errorf("'%s' log address expected %v got %x", name, log.AddressF, logs[i].Address)
}
if !bytes.Equal(logs[i].Data, helper.FromHex(log.DataF)) {
if !bytes.Equal(logs[i].Data, common.FromHex(log.DataF)) {
t.Errorf("'%s' log data expected %v got %x", name, log.DataF, logs[i].Data)
}