aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/client.go
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-03-23 16:22:56 +0800
committerGitHub <noreply@github.com>2017-03-23 16:22:56 +0800
commit3fa0fa713bc1508835bdecd7dea78ff09803e327 (patch)
tree6a5d4a7dcfd72489bd4f7df70f5188a636947c24 /rpc/client.go
parent525116dbff916825463931361f75e75e955c12e2 (diff)
parentf1534f5797664856218c8347366488f37f1e7924 (diff)
downloaddexon-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 'rpc/client.go')
-rw-r--r--rpc/client.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/rpc/client.go b/rpc/client.go
index 78a6fe789..2c35ba54a 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -19,6 +19,7 @@ package rpc
import (
"bytes"
"container/list"
+ "context"
"encoding/json"
"errors"
"fmt"
@@ -31,7 +32,6 @@ import (
"time"
"github.com/ethereum/go-ethereum/log"
- "golang.org/x/net/context"
)
var (