From e7c9b46a1e4e01e0c0424dc774b2e1a970d7d164 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Mon, 9 Sep 2019 16:08:23 -0700
Subject: [PATCH] Move ErrorForBadProto

---
 src/objective-c/ProtoRPC/ProtoRPC.m       | 18 ++++++++++++++++++
 src/objective-c/ProtoRPC/ProtoRPCLegacy.m | 18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/objective-c/ProtoRPC/ProtoRPC.m b/src/objective-c/ProtoRPC/ProtoRPC.m
index dbfa3c0f23d..9c0eb13d9d6 100644
--- a/src/objective-c/ProtoRPC/ProtoRPC.m
+++ b/src/objective-c/ProtoRPC/ProtoRPC.m
@@ -273,3 +273,21 @@
 }
 
 @end
+
+/**
+ * Generate an NSError object that represents a failure in parsing a proto class.
+ */
+NSError *ErrorForBadProto(id proto, Class expectedClass, NSError *parsingError) {
+  NSDictionary *info = @{
+    NSLocalizedDescriptionKey : @"Unable to parse response from the server",
+    NSLocalizedRecoverySuggestionErrorKey :
+        @"If this RPC is idempotent, retry "
+        @"with exponential backoff. Otherwise, query the server status before "
+        @"retrying.",
+    NSUnderlyingErrorKey : parsingError,
+    @"Expected class" : expectedClass,
+    @"Received value" : proto,
+  };
+  // TODO(jcanizales): Use kGRPCErrorDomain and GRPCErrorCodeInternal when they're public.
+  return [NSError errorWithDomain:@"io.grpc" code:13 userInfo:info];
+}
diff --git a/src/objective-c/ProtoRPC/ProtoRPCLegacy.m b/src/objective-c/ProtoRPC/ProtoRPCLegacy.m
index 4ba93674063..eaa02e9170b 100644
--- a/src/objective-c/ProtoRPC/ProtoRPCLegacy.m
+++ b/src/objective-c/ProtoRPC/ProtoRPCLegacy.m
@@ -101,21 +101,3 @@
 @implementation GRPCProtoCall
 
 @end
-
-/**
- * Generate an NSError object that represents a failure in parsing a proto class.
- */
-NSError *ErrorForBadProto(id proto, Class expectedClass, NSError *parsingError) {
-  NSDictionary *info = @{
-    NSLocalizedDescriptionKey : @"Unable to parse response from the server",
-    NSLocalizedRecoverySuggestionErrorKey :
-        @"If this RPC is idempotent, retry "
-        @"with exponential backoff. Otherwise, query the server status before "
-        @"retrying.",
-    NSUnderlyingErrorKey : parsingError,
-    @"Expected class" : expectedClass,
-    @"Received value" : proto,
-  };
-  // TODO(jcanizales): Use kGRPCErrorDomain and GRPCErrorCodeInternal when they're public.
-  return [NSError errorWithDomain:@"io.grpc" code:13 userInfo:info];
-}