aboutsummaryrefslogtreecommitdiffstats
path: root/mobile
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2017-01-05 21:03:50 +0800
committerFelix Lange <fjl@twurst.com>2017-01-06 21:15:22 +0800
commit7731061903bb992f7630ab389863951efb360258 (patch)
treeea706da87ce002a631cba30b171cb44dbdd7c2c6 /mobile
parentb9683d3748dcb73ab5a5474334eaf157267d9c4a (diff)
downloadgo-tangerine-7731061903bb992f7630ab389863951efb360258.tar
go-tangerine-7731061903bb992f7630ab389863951efb360258.tar.gz
go-tangerine-7731061903bb992f7630ab389863951efb360258.tar.bz2
go-tangerine-7731061903bb992f7630ab389863951efb360258.tar.lz
go-tangerine-7731061903bb992f7630ab389863951efb360258.tar.xz
go-tangerine-7731061903bb992f7630ab389863951efb360258.tar.zst
go-tangerine-7731061903bb992f7630ab389863951efb360258.zip
core/vm: move Log to core/types
This significantly reduces the dependency closure of ethclient, which no longer depends on core/vm as of this change. All uses of vm.Logs are replaced by []*types.Log. NewLog is gone too, the constructor simply returned a literal.
Diffstat (limited to 'mobile')
-rw-r--r--mobile/ethclient.go5
-rw-r--r--mobile/vm.go6
2 files changed, 5 insertions, 6 deletions
diff --git a/mobile/ethclient.go b/mobile/ethclient.go
index 36a15aa47..4e8328501 100644
--- a/mobile/ethclient.go
+++ b/mobile/ethclient.go
@@ -22,7 +22,6 @@ import (
"math/big"
"github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/ethclient"
)
@@ -191,7 +190,7 @@ func (ec *EthereumClient) FilterLogs(ctx *Context, query *FilterQuery) (logs *Lo
return nil, err
}
// Temp hack due to vm.Logs being []*vm.Log
- res := make(vm.Logs, len(rawLogs))
+ res := make([]*types.Log, len(rawLogs))
for i, log := range rawLogs {
res[i] = &log
}
@@ -208,7 +207,7 @@ type FilterLogsHandler interface {
// SubscribeFilterLogs subscribes to the results of a streaming filter query.
func (ec *EthereumClient) SubscribeFilterLogs(ctx *Context, query *FilterQuery, handler FilterLogsHandler, buffer int) (sub *Subscription, _ error) {
// Subscribe to the event internally
- ch := make(chan vm.Log, buffer)
+ ch := make(chan types.Log, buffer)
rawSub, err := ec.client.SubscribeFilterLogs(ctx.context, query.query, ch)
if err != nil {
return nil, err
diff --git a/mobile/vm.go b/mobile/vm.go
index cb098d390..72093e3d5 100644
--- a/mobile/vm.go
+++ b/mobile/vm.go
@@ -21,13 +21,13 @@ package geth
import (
"errors"
- "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/core/types"
)
// Log represents a contract log event. These events are generated by the LOG
// opcode and stored/indexed by the node.
type Log struct {
- log *vm.Log
+ log *types.Log
}
func (l *Log) GetAddress() *Address { return &Address{l.log.Address} }
@@ -40,7 +40,7 @@ func (l *Log) GetBlockHash() *Hash { return &Hash{l.log.BlockHash} }
func (l *Log) GetIndex() int { return int(l.log.Index) }
// Logs represents a slice of VM logs.
-type Logs struct{ logs vm.Logs }
+type Logs struct{ logs []*types.Log }
// Size returns the number of logs in the slice.
func (l *Logs) Size() int {