diff options
author | Felix Lange <fjl@twurst.com> | 2017-03-23 01:20:33 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2017-03-23 03:49:15 +0800 |
commit | c213fd1fd8bb624241da7fc98cf25098d8b92761 (patch) | |
tree | 7b109b0962b34d90d275a1dd1f64fbdba588bf9f /eth/filters | |
parent | 525116dbff916825463931361f75e75e955c12e2 (diff) | |
download | go-tangerine-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar go-tangerine-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.gz go-tangerine-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.bz2 go-tangerine-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.lz go-tangerine-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.xz go-tangerine-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.zst go-tangerine-c213fd1fd8bb624241da7fc98cf25098d8b92761.zip |
all: import "context" instead of "golang.org/x/net/context"
There is no need to depend on the old context package now that the
minimum Go version is 1.7. The move to "context" eliminates our weird
vendoring setup. Some vendored code still uses golang.org/x/net/context
and it is now vendored in the normal way.
This change triggered new vet checks around context.WithTimeout which
didn't fire with golang.org/x/net/context.
Diffstat (limited to 'eth/filters')
-rw-r--r-- | eth/filters/api.go | 3 | ||||
-rw-r--r-- | eth/filters/filter.go | 5 | ||||
-rw-r--r-- | eth/filters/filter_system.go | 5 | ||||
-rw-r--r-- | eth/filters/filter_system_test.go | 3 | ||||
-rw-r--r-- | eth/filters/filter_test.go | 3 |
5 files changed, 8 insertions, 11 deletions
diff --git a/eth/filters/api.go b/eth/filters/api.go index 02a544ce1..61647a5d0 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -17,6 +17,7 @@ package filters import ( + "context" "encoding/json" "errors" "fmt" @@ -24,8 +25,6 @@ import ( "sync" "time" - "golang.org/x/net/context" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 9a8e2fd70..0a0b81224 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -17,10 +17,10 @@ package filters import ( + "context" "math" - "time" - "math/big" + "time" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" @@ -28,7 +28,6 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/rpc" - "golang.org/x/net/context" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 3adf8111a..7abace1e6 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -19,6 +19,7 @@ package filters import ( + "context" "errors" "fmt" "sync" @@ -29,7 +30,6 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/rpc" - "golang.org/x/net/context" ) // Type determines the kind of filter and is used to put the filter in to @@ -372,7 +372,8 @@ func (es *EventSystem) lightFilterNewHead(newHeader *types.Header, callBack func func (es *EventSystem) lightFilterLogs(header *types.Header, addresses []common.Address, topics [][]common.Hash, remove bool) []*types.Log { if bloomFilter(header.Bloom, addresses, topics) { // Get the logs of the block - ctx, _ := context.WithTimeout(context.Background(), time.Second*5) + ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) + defer cancel() receipts, err := es.backend.GetReceipts(ctx, header.Hash()) if err != nil { return nil diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 1cfced7e4..d9c245a85 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -17,13 +17,12 @@ package filters import ( + "context" "math/big" "reflect" "testing" "time" - "golang.org/x/net/context" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 83ff3e9ce..c2dc2b842 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -17,13 +17,12 @@ package filters import ( + "context" "io/ioutil" "math/big" "os" "testing" - "golang.org/x/net/context" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" |