From 443c6773577b08d9fb693116a22bf13d01bd2f7a Mon Sep 17 00:00:00 2001
From: Hitoshi Mitake <mitake.hitoshi@gmail.com>
Date: Wed, 30 Mar 2016 22:40:42 +0900
Subject: [PATCH] etcdserver: extract togRPCError() to a separated file

It is used from multiple files in v3rpc package.
---
 etcdserver/api/v3rpc/key.go  | 22 -------------------
 etcdserver/api/v3rpc/util.go | 42 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 22 deletions(-)
 create mode 100644 etcdserver/api/v3rpc/util.go

diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go
index 33039f15b..c7f2f9d56 100644
--- a/etcdserver/api/v3rpc/key.go
+++ b/etcdserver/api/v3rpc/key.go
@@ -21,12 +21,8 @@ import (
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/storage"
 	"github.com/coreos/pkg/capnslog"
 	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
 )
 
 var (
@@ -261,21 +257,3 @@ func checkRequestUnion(u *pb.RequestUnion) error {
 	}
 	return nil
 }
-
-func togRPCError(err error) error {
-	switch err {
-	case storage.ErrCompacted:
-		return rpctypes.ErrCompacted
-	case storage.ErrFutureRev:
-		return rpctypes.ErrFutureRev
-	case lease.ErrLeaseNotFound:
-		return rpctypes.ErrLeaseNotFound
-	// TODO: handle error from raft and timeout
-	case etcdserver.ErrRequestTooLarge:
-		return rpctypes.ErrRequestTooLarge
-	case etcdserver.ErrNoSpace:
-		return rpctypes.ErrNoSpace
-	default:
-		return grpc.Errorf(codes.Internal, err.Error())
-	}
-}
diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go
new file mode 100644
index 000000000..8780d71d6
--- /dev/null
+++ b/etcdserver/api/v3rpc/util.go
@@ -0,0 +1,42 @@
+// Copyright 2016 Nippon Telegraph and Telephone Corporation.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v3rpc
+
+import (
+	"github.com/coreos/etcd/etcdserver"
+	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
+	"github.com/coreos/etcd/lease"
+	"github.com/coreos/etcd/storage"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+)
+
+func togRPCError(err error) error {
+	switch err {
+	case storage.ErrCompacted:
+		return rpctypes.ErrCompacted
+	case storage.ErrFutureRev:
+		return rpctypes.ErrFutureRev
+	case lease.ErrLeaseNotFound:
+		return rpctypes.ErrLeaseNotFound
+	// TODO: handle error from raft and timeout
+	case etcdserver.ErrRequestTooLarge:
+		return rpctypes.ErrRequestTooLarge
+	case etcdserver.ErrNoSpace:
+		return rpctypes.ErrNoSpace
+	default:
+		return grpc.Errorf(codes.Internal, err.Error())
+	}
+}