aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/ethtest/main.go8
-rw-r--r--tests/helper/init.go10
-rw-r--r--tests/helper/trie.go6
-rw-r--r--tests/helper/vm.go30
-rw-r--r--tests/vm/gh_test.go8
5 files changed, 31 insertions, 31 deletions
diff --git a/tests/ethtest/main.go b/tests/ethtest/main.go
index fb423cbd0..82fad9caf 100644
--- a/tests/ethtest/main.go
+++ b/tests/ethtest/main.go
@@ -8,8 +8,8 @@ import (
"os"
"strings"
- "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/tests/helper"
)
@@ -20,8 +20,8 @@ type Account struct {
Storage map[string]string
}
-func StateObjectFromAccount(addr string, account Account) *ethstate.StateObject {
- obj := ethstate.NewStateObject(ethutil.Hex2Bytes(addr))
+func StateObjectFromAccount(addr string, account Account) *state.StateObject {
+ obj := state.NewStateObject(ethutil.Hex2Bytes(addr))
obj.SetBalance(ethutil.Big(account.Balance))
if ethutil.IsHex(account.Code) {
@@ -53,7 +53,7 @@ func RunVmTest(js string) (failed int) {
}
for name, test := range tests {
- state := ethstate.New(helper.NewTrie())
+ state := state.New(helper.NewTrie())
for addr, account := range test.Pre {
obj := StateObjectFromAccount(addr, account)
state.SetStateObject(obj)
diff --git a/tests/helper/init.go b/tests/helper/init.go
index 896ed5fe0..df98b9e42 100644
--- a/tests/helper/init.go
+++ b/tests/helper/init.go
@@ -4,16 +4,16 @@ import (
"log"
"os"
- "github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethutil"
+ logpkg "github.com/ethereum/go-ethereum/logger"
)
-var Logger ethlog.LogSystem
-var Log = ethlog.NewLogger("TEST")
+var Logger logpkg.LogSystem
+var Log = logpkg.NewLogger("TEST")
func init() {
- Logger = ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.InfoLevel)
- ethlog.AddLogSystem(Logger)
+ Logger = logpkg.NewStdLogSystem(os.Stdout, log.LstdFlags, logpkg.InfoLevel)
+ logpkg.AddLogSystem(Logger)
ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
}
diff --git a/tests/helper/trie.go b/tests/helper/trie.go
index 119bac713..32432cc7a 100644
--- a/tests/helper/trie.go
+++ b/tests/helper/trie.go
@@ -1,6 +1,6 @@
package helper
-import "github.com/ethereum/go-ethereum/ethtrie"
+import "github.com/ethereum/go-ethereum/trie"
type MemDatabase struct {
db map[string][]byte
@@ -24,8 +24,8 @@ func (db *MemDatabase) Print() {}
func (db *MemDatabase) Close() {}
func (db *MemDatabase) LastKnownTD() []byte { return nil }
-func NewTrie() *ethtrie.Trie {
+func NewTrie() *trie.Trie {
db, _ := NewMemDatabase()
- return ethtrie.New(db, "")
+ return trie.New(db, "")
}
diff --git a/tests/helper/vm.go b/tests/helper/vm.go
index c56c5bae7..4827dfdee 100644
--- a/tests/helper/vm.go
+++ b/tests/helper/vm.go
@@ -3,13 +3,13 @@ package helper
import (
"math/big"
- "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/vm"
)
type Env struct {
- state *ethstate.State
+ state *state.State
origin []byte
parent []byte
@@ -21,13 +21,13 @@ type Env struct {
gasLimit *big.Int
}
-func NewEnv(state *ethstate.State) *Env {
+func NewEnv(state *state.State) *Env {
return &Env{
state: state,
}
}
-func NewEnvFromMap(state *ethstate.State, envValues map[string]string, exeValues map[string]string) *Env {
+func NewEnvFromMap(state *state.State, envValues map[string]string, exeValues map[string]string) *Env {
env := NewEnv(state)
env.origin = ethutil.Hex2Bytes(exeValues["caller"])
@@ -41,21 +41,21 @@ func NewEnvFromMap(state *ethstate.State, envValues map[string]string, exeValues
return env
}
-func (self *Env) Origin() []byte { return self.origin }
-func (self *Env) BlockNumber() *big.Int { return self.number }
-func (self *Env) PrevHash() []byte { return self.parent }
-func (self *Env) Coinbase() []byte { return self.coinbase }
-func (self *Env) Time() int64 { return self.time }
-func (self *Env) Difficulty() *big.Int { return self.difficulty }
-func (self *Env) BlockHash() []byte { return nil }
-func (self *Env) State() *ethstate.State { return self.state }
-func (self *Env) GasLimit() *big.Int { return self.gasLimit }
-func (self *Env) AddLog(vm.Log) {}
+func (self *Env) Origin() []byte { return self.origin }
+func (self *Env) BlockNumber() *big.Int { return self.number }
+func (self *Env) PrevHash() []byte { return self.parent }
+func (self *Env) Coinbase() []byte { return self.coinbase }
+func (self *Env) Time() int64 { return self.time }
+func (self *Env) Difficulty() *big.Int { return self.difficulty }
+func (self *Env) BlockHash() []byte { return nil }
+func (self *Env) State() *state.State { return self.state }
+func (self *Env) GasLimit() *big.Int { return self.gasLimit }
+func (self *Env) AddLog(vm.Log) {}
func (self *Env) Transfer(from, to vm.Account, amount *big.Int) error {
return vm.Transfer(from, to, amount)
}
-func RunVm(state *ethstate.State, env, exec map[string]string) ([]byte, *big.Int, error) {
+func RunVm(state *state.State, env, exec map[string]string) ([]byte, *big.Int, error) {
address := FromHex(exec["address"])
caller := state.GetOrNewStateObject(FromHex(exec["caller"]))
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
index 0d3c2f93d..da9de6db5 100644
--- a/tests/vm/gh_test.go
+++ b/tests/vm/gh_test.go
@@ -4,8 +4,8 @@ import (
"bytes"
"testing"
- "github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/tests/helper"
)
@@ -16,8 +16,8 @@ type Account struct {
Storage map[string]string
}
-func StateObjectFromAccount(addr string, account Account) *ethstate.StateObject {
- obj := ethstate.NewStateObject(ethutil.Hex2Bytes(addr))
+func StateObjectFromAccount(addr string, account Account) *state.StateObject {
+ obj := state.NewStateObject(ethutil.Hex2Bytes(addr))
obj.SetBalance(ethutil.Big(account.Balance))
if ethutil.IsHex(account.Code) {
@@ -44,7 +44,7 @@ func RunVmTest(p string, t *testing.T) {
helper.CreateFileTests(t, p, &tests)
for name, test := range tests {
- state := ethstate.New(helper.NewTrie())
+ state := state.New(helper.NewTrie())
for addr, account := range test.Pre {
obj := StateObjectFromAccount(addr, account)
state.SetStateObject(obj)