diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-01-06 21:42:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 21:42:03 +0800 |
| commit | 8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184 (patch) | |
| tree | 92a336065bddcd620798e8f552432e3ed62ee14a /tests/vm_test_util.go | |
| parent | e0ee0cc66a4416edd47232649f4d4bca4a5e3c07 (diff) | |
| parent | d3b751e4d94f95f6cc89544852f2d5811e075665 (diff) | |
| download | go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.gz go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.bz2 go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.lz go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.xz go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.zst go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.zip | |
Merge pull request #3518 from fjl/ethclient-dependency-cleanup
core/types: dependency cleanup
Diffstat (limited to 'tests/vm_test_util.go')
| -rw-r--r-- | tests/vm_test_util.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index dc9f1d62c..d6411147f 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -26,6 +26,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger/glog" @@ -164,7 +165,7 @@ func runVmTest(test VmTest) error { ret []byte gas *big.Int err error - logs vm.Logs + logs []*types.Log ) ret, logs, gas, err = RunVm(statedb, env, test.Exec) @@ -211,7 +212,7 @@ func runVmTest(test VmTest) error { return nil } -func RunVm(statedb *state.StateDB, env, exec map[string]string) ([]byte, vm.Logs, *big.Int, error) { +func RunVm(statedb *state.StateDB, env, exec map[string]string) ([]byte, []*types.Log, *big.Int, error) { chainConfig := ¶ms.ChainConfig{ HomesteadBlock: params.MainNetHomesteadBlock, DAOForkBlock: params.MainNetDAOForkBlock, |