Merge pull request #3518 from fjl/ethclient-dependency-cleanup

core/types: dependency cleanup

3 files changed, 7 insertions, 8 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/params.go b/mobile/params.go
index 8d5d3edbe..87747c7b0 100644
--- a/mobile/params.go
+++ b/mobile/params.go
@@ -85,8 +85,8 @@ func NewChainConfig() *ChainConfig {
 // by the foundation running the V5 discovery protocol.
 func FoundationBootnodes() *Enodes {
 	nodes := &Enodes{nodes: make([]*discv5.Node, len(params.DiscoveryV5Bootnodes))}
-	for i, node := range params.DiscoveryV5Bootnodes {
-		nodes.nodes[i] = node
+	for i, url := range params.DiscoveryV5Bootnodes {
+		nodes.nodes[i] = discv5.MustParseNode(url)
 	}
 	return nodes
 }
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 {