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 /les/odr_test.go | |
| 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 'les/odr_test.go')
| -rw-r--r-- | les/odr_test.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/les/odr_test.go b/les/odr_test.go index 1b436b8e6..6b074f1a2 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -18,6 +18,7 @@ package les import ( "bytes" + "context" "math/big" "testing" "time" @@ -32,7 +33,6 @@ import ( "github.com/ethereum/go-ethereum/light" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - "golang.org/x/net/context" ) type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte @@ -181,8 +181,11 @@ func testOdr(t *testing.T, protocol int, expFail uint64, fn odrTestFn) { for i := uint64(0); i <= pm.blockchain.CurrentHeader().Number.Uint64(); i++ { bhash := core.GetCanonicalHash(db, i) b1 := fn(light.NoOdr, db, pm.chainConfig, pm.blockchain.(*core.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, lpm.chainConfig, nil, lpm.blockchain.(*light.LightChain), bhash) + eq := bytes.Equal(b1, b2) exp := i < expFail if exp && !eq { |