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 /ethclient/ethclient.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 'ethclient/ethclient.go')
| -rw-r--r-- | ethclient/ethclient.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 3acaaa0d1..1d04d9e03 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -26,7 +26,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" "golang.org/x/net/context" @@ -294,14 +293,14 @@ func (ec *Client) NonceAt(ctx context.Context, account common.Address, blockNumb // Filters // FilterLogs executes a filter query. -func (ec *Client) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]vm.Log, error) { - var result []vm.Log +func (ec *Client) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error) { + var result []types.Log err := ec.c.CallContext(ctx, &result, "eth_getLogs", toFilterArg(q)) return result, err } // SubscribeFilterLogs subscribes to the results of a streaming filter query. -func (ec *Client) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery, ch chan<- vm.Log) (ethereum.Subscription, error) { +func (ec *Client) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery, ch chan<- types.Log) (ethereum.Subscription, error) { return ec.c.EthSubscribe(ctx, ch, "logs", toFilterArg(q)) } |