diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-03-23 16:22:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 16:22:56 +0800 |
| commit | 3fa0fa713bc1508835bdecd7dea78ff09803e327 (patch) | |
| tree | 6a5d4a7dcfd72489bd4f7df70f5188a636947c24 /les/request_test.go | |
| parent | 525116dbff916825463931361f75e75e955c12e2 (diff) | |
| parent | f1534f5797664856218c8347366488f37f1e7924 (diff) | |
| download | go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.gz go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.bz2 go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.lz go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.xz go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.zst go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.zip | |
Merge pull request #3809 from fjl/all-use-normal-context
all: import "context" instead of "golang.org/x/net/context"
Diffstat (limited to 'les/request_test.go')
| -rw-r--r-- | les/request_test.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/les/request_test.go b/les/request_test.go index bec6bf1bc..ba1fc15bd 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -17,6 +17,7 @@ package les import ( + "context" "testing" "time" @@ -25,7 +26,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/light" - "golang.org/x/net/context" ) var testBankSecureTrieKey = secAddr(testBankAddress) @@ -91,7 +91,9 @@ func testAccess(t *testing.T, protocol int, fn accessTestFn) { for i := uint64(0); i <= pm.blockchain.CurrentHeader().Number.Uint64(); i++ { bhash := core.GetCanonicalHash(db, i) if req := fn(ldb, bhash, i); req != nil { - ctx, _ := context.WithTimeout(context.Background(), 200*time.Millisecond) + ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond) + defer cancel() + err := odr.Retrieve(ctx, req) got := err == nil exp := i < expFail |