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 /eth/api.go | |
| parent | 525116dbff916825463931361f75e75e955c12e2 (diff) | |
| parent | f1534f5797664856218c8347366488f37f1e7924 (diff) | |
| download | dexon-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar dexon-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.gz dexon-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.bz2 dexon-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.lz dexon-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.xz dexon-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.zst dexon-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 'eth/api.go')
| -rw-r--r-- | eth/api.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eth/api.go b/eth/api.go index b17968ebb..b64153fd7 100644 --- a/eth/api.go +++ b/eth/api.go @@ -19,6 +19,7 @@ package eth import ( "bytes" "compress/gzip" + "context" "errors" "fmt" "io" @@ -39,7 +40,6 @@ import ( "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - "golang.org/x/net/context" ) const defaultTraceTimeout = 5 * time.Second |