From 9d70f39b7e53bb10a578ffd5846e14dd788cc63b Mon Sep 17 00:00:00 2001
From: Robert <bobert.mushky@gmail.com>
Date: Mon, 25 Oct 2021 19:00:59 -0700
Subject: [PATCH] remove copied test proto file and modify npm command

---
 packages/grpc-js/package.json                 |  2 +-
 packages/grpc-js/proto/test_service.proto     | 42 -------------------
 packages/grpc-js/src/generated/Request.ts     |  2 +-
 packages/grpc-js/src/generated/Response.ts    |  2 +-
 packages/grpc-js/src/generated/TestService.ts |  2 +-
 5 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 packages/grpc-js/proto/test_service.proto

diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index f430c09d..76a0902b 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -54,7 +54,7 @@
     "fix": "gts fix src/*.ts",
     "pretest": "npm run generate-types && npm run compile",
     "posttest": "npm run check && madge -c ./build/src",
-    "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs proto/ -O src/generated/ --grpcLib ../index channelz.proto test_service.proto"
+    "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs proto/ --include-dirs test/fixtures/ -O src/generated/ --grpcLib ../index channelz.proto test_service.proto"
   },
   "dependencies": {
     "@grpc/proto-loader": "^0.6.4",
diff --git a/packages/grpc-js/proto/test_service.proto b/packages/grpc-js/proto/test_service.proto
deleted file mode 100644
index f99393d1..00000000
--- a/packages/grpc-js/proto/test_service.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2019 gRPC authors.
- *
- * 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.
- *
- */
-
-syntax = "proto3";
-
-message Request {
-  bool error = 1;
-  string message = 2;
-  int32 errorAfter = 3;
-}
-
-message Response {
-  int32 count = 1;
-}
-
-service TestService {
-  rpc Unary (Request) returns (Response) {
-  }
-
-  rpc ClientStream (stream Request) returns (Response) {
-  }
-
-  rpc ServerStream (Request) returns (stream Response) {
-  }
-
-  rpc BidiStream (stream Request) returns (stream Response) {
-  }
-}
diff --git a/packages/grpc-js/src/generated/Request.ts b/packages/grpc-js/src/generated/Request.ts
index 93898a70..d64ebb6e 100644
--- a/packages/grpc-js/src/generated/Request.ts
+++ b/packages/grpc-js/src/generated/Request.ts
@@ -1,4 +1,4 @@
-// Original file: proto/test_service.proto
+// Original file: test/fixtures/test_service.proto
 
 
 export interface Request {
diff --git a/packages/grpc-js/src/generated/Response.ts b/packages/grpc-js/src/generated/Response.ts
index 980bfdd1..217fc75e 100644
--- a/packages/grpc-js/src/generated/Response.ts
+++ b/packages/grpc-js/src/generated/Response.ts
@@ -1,4 +1,4 @@
-// Original file: proto/test_service.proto
+// Original file: test/fixtures/test_service.proto
 
 
 export interface Response {
diff --git a/packages/grpc-js/src/generated/TestService.ts b/packages/grpc-js/src/generated/TestService.ts
index dd1d22ab..f890c520 100644
--- a/packages/grpc-js/src/generated/TestService.ts
+++ b/packages/grpc-js/src/generated/TestService.ts
@@ -1,4 +1,4 @@
-// Original file: proto/test_service.proto
+// Original file: test/fixtures/test_service.proto
 
 import type * as grpc from './../index'
 import type { MethodDefinition } from '@grpc/proto-loader'