aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/api/eth_args.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-10-05 22:14:01 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-10-05 22:14:01 +0800
commit5b34fa538e54320778314081df97da561f7c6314 (patch)
treedca15c858b8ac4cd79ed7b7733260ab3021bbd0c /rpc/api/eth_args.go
parent8b865fa9bf75e728d5d76f5a1460e0c37d8b5f9e (diff)
parent7c7692933c21b77328a94eed714f66c276776197 (diff)
downloadgo-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar
go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.gz
go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.bz2
go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.lz
go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.xz
go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.zst
go-tangerine-5b34fa538e54320778314081df97da561f7c6314.zip
Merge pull request #1756 from obscuren/core-refactor
core, core/vm: refactor
Diffstat (limited to 'rpc/api/eth_args.go')
-rw-r--r--rpc/api/eth_args.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index 8bd077e20..66c190a51 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -24,8 +24,8 @@ import (
"strings"
"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/rpc/shared"
)
@@ -830,7 +830,7 @@ type LogRes struct {
TransactionIndex *hexnum `json:"transactionIndex"`
}
-func NewLogRes(log *state.Log) LogRes {
+func NewLogRes(log *vm.Log) LogRes {
var l LogRes
l.Topics = make([]*hexdata, len(log.Topics))
for j, topic := range log.Topics {
@@ -847,7 +847,7 @@ func NewLogRes(log *state.Log) LogRes {
return l
}
-func NewLogsRes(logs state.Logs) (ls []LogRes) {
+func NewLogsRes(logs vm.Logs) (ls []LogRes) {
ls = make([]LogRes, len(logs))
for i, log := range logs {