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 /light/odr_test.go | |
| parent | 525116dbff916825463931361f75e75e955c12e2 (diff) | |
| download | dexon-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.gz dexon-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.zst dexon-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 'light/odr_test.go')
| -rw-r--r-- | light/odr_test.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/light/odr_test.go b/light/odr_test.go index e2eced346..ba82ec04f 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -18,6 +18,7 @@ package light import ( "bytes" + "context" "errors" "math/big" "testing" @@ -36,7 +37,6 @@ import ( "github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/trie" - "golang.org/x/net/context" ) var ( @@ -277,8 +277,11 @@ func testChainOdr(t *testing.T, protocol int, expFail uint64, fn odrTestFn) { for i := uint64(0); i <= blockchain.CurrentHeader().Number.Uint64(); i++ { bhash := core.GetCanonicalHash(sdb, i) b1 := fn(NoOdr, sdb, blockchain, nil, bhash) - ctx, _ := context.WithTimeout(context.Background(), 200*time.Millisecond) + + ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond) + defer cancel() b2 := fn(ctx, ldb, nil, lightchain, bhash) + eq := bytes.Equal(b1, b2) exp := i < expFail if exp && !eq { |