remove dependency on common-grpc

googleapis · Nov 14, 2017 · 876d5b6 · 876d5b6
1 parent a08e5c7
commit 876d5b6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json
@@ -52,7 +52,6 @@
   ],
   "dependencies": {
     "@google-cloud/common": "^0.13.0",
-    "@google-cloud/common-grpc": "^0.4.2",
     "arrify": "^1.0.0",
     "async-each": "^1.0.1",
     "extend": "^3.0.0",

diff --git a/packages/pubsub/src/connection-pool.js b/packages/pubsub/src/connection-pool.js
@@ -24,7 +24,7 @@ var arrify = require('arrify');
 var common = require('@google-cloud/common');
 var each = require('async-each');
 var events = require('events');
-var grpc = require('@google-cloud/common-grpc').grpc;
+var grpc = require('google-gax').grpc().grpc;
 var is = require('is');
 var util = require('util');
 var uuid = require('uuid');

diff --git a/packages/pubsub/test/connection-pool.js b/packages/pubsub/test/connection-pool.js
@@ -32,6 +32,12 @@ var fakeUtil = extend({}, common.util);
 var fakeUuid = extend({}, uuid);
 var fakeGrpc = extend({}, grpc);
 
+function fakeGaxGrpc() {
+  return {
+    grpc: fakeGrpc
+  };
+}
+
 var v1Override;
 function fakeV1(options) {
   return (v1Override || v1)(options);
@@ -95,8 +101,8 @@ describe('ConnectionPool', function() {
       '@google-cloud/common': {
         util: fakeUtil
       },
-      '@google-cloud/common-grpc': {
-        grpc: fakeGrpc
+      'google-gax': {
+        grpc: fakeGaxGrpc
       },
       uuid: fakeUuid,
       './v1': fakeV1

diff --git a/packages/pubsub/test/iam.js b/packages/pubsub/test/iam.js
@@ -18,9 +18,6 @@
 
 var assert = require('assert');
 var extend = require('extend');
-var GrpcService = require('@google-cloud/common-grpc').Service;
-var nodeutil = require('util');
-var path = require('path');
 var proxyquire = require('proxyquire');
 var util = require('@google-cloud/common').util;
 
@@ -33,13 +30,6 @@ var fakeUtil = extend({}, util, {
   }
 });
 
-function FakeGrpcService() {
-  this.calledWith_ = arguments;
-  GrpcService.apply(this, arguments);
-}
-
-nodeutil.inherits(FakeGrpcService, GrpcService);
-
 describe('IAM', function() {
   var IAM;
   var iam;
@@ -54,9 +44,6 @@ describe('IAM', function() {
     IAM = proxyquire('../src/iam.js', {
       '@google-cloud/common': {
         util: fakeUtil
-      },
-      '@google-cloud/common-grpc': {
-        Service: FakeGrpcService
       }
     });
   });