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.

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")