Switch serializer tests to test round trips + remove deprecated grpc.load()

packages/firestore/package.json

@@ -31,6 +31,7 @@
     "@firebase/logger": "0.1.11",
     "@firebase/webchannel-wrapper": "0.2.17",
     "grpc": "1.19.0",
+    "@grpc/proto-loader": "^0.4.0",
     "tslib": "1.9.3"
   },
   "peerDependencies": {

packages/firestore/src/platform_node/load_protos.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import * as protoLoader from '@grpc/proto-loader';
 import * as grpc from 'grpc';
 import { resolve } from 'path';
 
@@ -24,19 +25,22 @@ import { resolve } from 'path';
  * @returns The GrpcObject representing our protos.
  */
 export function loadProtos(): grpc.GrpcObject {
-  const options = {
-    // Beware that converting fields to camel case does not convert the tag
-    // fields in oneof groups (!!!). This will likely be fixed when we upgrade
-    // to protobufjs 6.x
-    convertFieldsToCamelCase: true
-  };
   const root = resolve(
     __dirname,
     process.env.FIRESTORE_PROTO_ROOT || '../protos'
   );
-  const firestoreProtoFile = {
-    root,
-    file: 'google/firestore/v1/firestore.proto'
-  };
-  return grpc.load(firestoreProtoFile, /*format=*/ 'proto', options);
+  const firestoreProtoFile = root + '/google/firestore/v1/firestore.proto';
+
+  // Beware that converting fields to camel case does not convert the tag fields
+  // in oneof groups (!!!). This will likely be fixed when we upgrade to
+  // protobufjs 6.x
+  const packageDefinition = protoLoader.loadSync(firestoreProtoFile, {
+    longs: String,
+    enums: String,
+    defaults: true,
+    oneofs: true,
+    includeDirs: [root]
+  });
+
+  return grpc.loadPackageDefinition(packageDefinition);
 }