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 /event | |
| 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 'event')
| -rw-r--r-- | event/subscription.go | 2 | ||||
| -rw-r--r-- | event/subscription_test.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/event/subscription.go b/event/subscription.go index 83bd21213..02d7b9d7d 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -17,11 +17,11 @@ package event import ( + "context" "sync" "time" "github.com/ethereum/go-ethereum/common/mclock" - "golang.org/x/net/context" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/event/subscription_test.go b/event/subscription_test.go index a4fe30298..aa6d98984 100644 --- a/event/subscription_test.go +++ b/event/subscription_test.go @@ -17,11 +17,10 @@ package event import ( + "context" "errors" "testing" "time" - - "golang.org/x/net/context" ) var errInts = errors.New("error in subscribeInts") |