use stdlib context

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"

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"

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

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"