From 844c43e0442b9d60fe73d3b63824f01a99320ac3 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 14 Nov 2017 22:30:00 +0000
Subject: [PATCH] use stdlib context

---
 rpc/grpc/api.go         | 2 +-
 rpc/grpc/grpc_test.go   | 2 +-
 rpc/grpc/types.pb.go    | 3 ++-
 test/app/grpc_client.go | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rpc/grpc/api.go b/rpc/grpc/api.go
index d4cad0640..f36b58000 100644
--- a/rpc/grpc/api.go
+++ b/rpc/grpc/api.go
@@ -1,7 +1,7 @@
 package core_grpc
 
 import (
-	context "golang.org/x/net/context"
+	"context"
 
 	abci "github.com/tendermint/abci/types"
 	core "github.com/tendermint/tendermint/rpc/core"
diff --git a/rpc/grpc/grpc_test.go b/rpc/grpc/grpc_test.go
index b62006a19..030a22b8d 100644
--- a/rpc/grpc/grpc_test.go
+++ b/rpc/grpc/grpc_test.go
@@ -1,11 +1,11 @@
 package core_grpc_test
 
 import (
+	"context"
 	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 
 	"github.com/tendermint/abci/example/dummy"
 	"github.com/tendermint/tendermint/rpc/grpc"
diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go
index 49e08d383..cf7a5ec71 100644
--- a/rpc/grpc/types.pb.go
+++ b/rpc/grpc/types.pb.go
@@ -22,7 +22,8 @@ import math "math"
 import types "github.com/tendermint/abci/types"
 
 import (
-	context "golang.org/x/net/context"
+	"context"
+
 	grpc "google.golang.org/grpc"
 )
 
diff --git a/test/app/grpc_client.go b/test/app/grpc_client.go
index e43b8ae39..9d024b1bc 100644
--- a/test/app/grpc_client.go
+++ b/test/app/grpc_client.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/tendermint/go-wire"
 	"github.com/tendermint/tendermint/rpc/grpc"