aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/helper/vm.go70
-rw-r--r--tests/vm/gh_test.go140
2 files changed, 58 insertions, 152 deletions
diff --git a/tests/helper/vm.go b/tests/helper/vm.go
index 8e6645fc3..6ee50a5ae 100644
--- a/tests/helper/vm.go
+++ b/tests/helper/vm.go
@@ -3,6 +3,7 @@ package helper
import (
"math/big"
+ "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/state"
@@ -10,7 +11,10 @@ import (
)
type Env struct {
- state *state.State
+ depth int
+ state *state.State
+ skipTransfer bool
+ Gas *big.Int
origin []byte
parent []byte
@@ -56,33 +60,71 @@ func (self *Env) GasLimit() *big.Int { return self.gasLimit }
func (self *Env) AddLog(log *state.Log) {
self.logs = append(self.logs, log)
}
+func (self *Env) Depth() int { return self.depth }
+func (self *Env) SetDepth(i int) { self.depth = i }
func (self *Env) Transfer(from, to vm.Account, amount *big.Int) error {
return vm.Transfer(from, to, amount)
}
+func (self *Env) vm(addr, data []byte, gas, price, value *big.Int) *chain.Execution {
+ evm := vm.New(self, vm.DebugVmTy)
+ exec := chain.NewExecution(evm, addr, data, gas, price, value)
+ exec.SkipTransfer = self.skipTransfer
+
+ return exec
+}
+
+func (self *Env) Call(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+ exe := self.vm(addr, data, gas, price, value)
+ ret, err := exe.Call(addr, caller)
+ self.Gas = exe.Gas
+
+ return ret, err
+}
+func (self *Env) CallCode(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+ exe := self.vm(caller.Address(), data, gas, price, value)
+ return exe.Call(addr, caller)
+}
+
+func (self *Env) Create(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ClosureRef) {
+ exe := self.vm(addr, data, gas, price, value)
+ return exe.Create(caller)
+}
+
func RunVm(state *state.State, env, exec map[string]string) ([]byte, state.Logs, *big.Int, error) {
- address := FromHex(exec["address"])
- caller := state.GetOrNewStateObject(FromHex(exec["caller"]))
+ var (
+ to = FromHex(exec["address"])
+ from = FromHex(exec["caller"])
+ data = FromHex(exec["data"])
+ gas = ethutil.Big(exec["gas"])
+ price = ethutil.Big(exec["gasPrice"])
+ value = ethutil.Big(exec["value"])
+ )
+
+ caller := state.GetOrNewStateObject(from)
vmenv := NewEnvFromMap(state, env, exec)
- evm := vm.New(vmenv, vm.DebugVmTy)
- execution := vm.NewExecution(evm, address, FromHex(exec["data"]), ethutil.Big(exec["gas"]), ethutil.Big(exec["gasPrice"]), ethutil.Big(exec["value"]))
- execution.SkipTransfer = true
- ret, err := execution.Exec(address, caller)
+ vmenv.skipTransfer = true
+ ret, err := vmenv.Call(caller, to, data, gas, price, value)
- return ret, vmenv.logs, execution.Gas, err
+ return ret, vmenv.logs, vmenv.Gas, err
}
func RunState(state *state.State, env, tx map[string]string) ([]byte, state.Logs, *big.Int, error) {
- address := FromHex(tx["to"])
- keyPair, _ := crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(tx["secretKey"])))
+ var (
+ keyPair, _ = crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(tx["secretKey"])))
+ to = FromHex(tx["to"])
+ data = FromHex(tx["data"])
+ gas = ethutil.Big(tx["gasLimit"])
+ price = ethutil.Big(tx["gasPrice"])
+ value = ethutil.Big(tx["value"])
+ )
+
caller := state.GetOrNewStateObject(keyPair.Address())
vmenv := NewEnvFromMap(state, env, tx)
vmenv.origin = caller.Address()
- evm := vm.New(vmenv, vm.DebugVmTy)
- execution := vm.NewExecution(evm, address, FromHex(tx["data"]), ethutil.Big(tx["gasLimit"]), ethutil.Big(tx["gasPrice"]), ethutil.Big(tx["value"]))
- ret, err := execution.Exec(address, caller)
+ ret, err := vmenv.Call(caller, to, data, gas, price, value)
- return ret, vmenv.logs, execution.Gas, err
+ return ret, vmenv.logs, vmenv.Gas, err
}
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
index 4c18d29e6..5c4df1975 100644
--- a/tests/vm/gh_test.go
+++ b/tests/vm/gh_test.go
@@ -1,147 +1,12 @@
package vm
-<<<<<<< HEAD
-// import (
-// "bytes"
-// "testing"
-
-// "github.com/ethereum/go-ethereum/ethutil"
-// "github.com/ethereum/go-ethereum/state"
-// "github.com/ethereum/go-ethereum/tests/helper"
-// )
-
-// type Account struct {
-// Balance string
-// Code string
-// Nonce string
-// Storage map[string]string
-// }
-
-// 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) {
-// 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(p string, t *testing.T) {
-// tests := make(map[string]VmTest)
-// helper.CreateFileTests(t, p, &tests)
-
-// for name, test := range tests {
-// state := state.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 {
-// t.Errorf("%s", err)
-// helper.Log.Infoln(err)
-// }
-
-// rexp := helper.FromHex(test.Out)
-// if bytes.Compare(rexp, ret) != 0 {
-// t.Errorf("%s's return failed. Expected %x, got %x\n", name, rexp, ret)
-// }
-
-// gexp := ethutil.Big(test.Gas)
-// if gexp.Cmp(gas) != 0 {
-// t.Errorf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas)
-// }
-
-// 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 {
-// t.Errorf("%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))
-// }
-// }
-// }
-// }
-// }
-
-// // I've created a new function for each tests so it's easier to identify where the problem lies if any of them fail.
-// func TestVMArithmetic(t *testing.T) {
-// //helper.Logger.SetLogLevel(5)
-// const fn = "../files/vmtests/vmArithmeticTest.json"
-// RunVmTest(fn, t)
-// }
-
-// /*
-// deleted?
-// func TestVMSystemOperation(t *testing.T) {
-// helper.Logger.SetLogLevel(5)
-// const fn = "../files/vmtests/vmSystemOperationsTest.json"
-// RunVmTest(fn, t)
-// }
-// */
-
-// func TestBitwiseLogicOperation(t *testing.T) {
-// const fn = "../files/vmtests/vmBitwiseLogicOperationTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestBlockInfo(t *testing.T) {
-// const fn = "../files/vmtests/vmBlockInfoTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestEnvironmentalInfo(t *testing.T) {
-// const fn = "../files/vmtests/vmEnvironmentalInfoTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestFlowOperation(t *testing.T) {
-// helper.Logger.SetLogLevel(5)
-// const fn = "../files/vmtests/vmIOandFlowOperationsTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestPushDupSwap(t *testing.T) {
-// const fn = "../files/vmtests/vmPushDupSwapTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestVMSha3(t *testing.T) {
-// const fn = "../files/vmtests/vmSha3Test.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestVm(t *testing.T) {
-// const fn = "../files/vmtests/vmtests.json"
-// RunVmTest(fn, t)
-// }
-=======
import (
"bytes"
"math/big"
"strconv"
"testing"
- "github.com/ethereum/go-ethereum/chain"
+ "github.com/ethereum/go-ethereum/chain/types"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/tests/helper"
@@ -263,7 +128,7 @@ func RunVmTest(p string, t *testing.T) {
}
if len(test.Logs) > 0 {
- genBloom := ethutil.LeftPadBytes(chain.LogsBloom(logs).Bytes(), 64)
+ genBloom := ethutil.LeftPadBytes(types.LogsBloom(logs).Bytes(), 64)
// Logs within the test itself aren't correct, missing empty fields (32 0s)
for bloom /*logs*/, _ := range test.Logs {
if !bytes.Equal(genBloom, ethutil.Hex2Bytes(bloom)) {
@@ -339,4 +204,3 @@ func TestStateSpecialTest(t *testing.T) {
const fn = "../files/StateTests/stSpecialTest.json"
RunVmTest(fn, t)
}
->>>>>>> develop
generated by cgit (git 2.34.1) at 2024-11-14 08:41:57 +0800