From 49c1c52bb5d8e4ee887ec84bd87fe09e59c8b3d0 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Mon, 28 Sep 2015 16:38:38 -0700
Subject: [PATCH] Removed now-redundant credentials wrappings

---
 ext/credentials.cc       | 46 ----------------------------------------
 ext/credentials.h        |  4 ----
 test/credentials_test.js |  2 +-
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/ext/credentials.cc b/ext/credentials.cc
index ec5cc5cb..182c99d0 100644
--- a/ext/credentials.cc
+++ b/ext/credentials.cc
@@ -78,21 +78,12 @@ void Credentials::Init(Local<Object> exports) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
   fun_tpl.Reset(tpl);
   Local<Function> ctr = Nan::GetFunction(tpl).ToLocalChecked();
-  Nan::Set(ctr, Nan::New("createDefault").ToLocalChecked(),
-           Nan::GetFunction(
-               Nan::New<FunctionTemplate>(CreateDefault)).ToLocalChecked());
   Nan::Set(ctr, Nan::New("createSsl").ToLocalChecked(),
            Nan::GetFunction(
                Nan::New<FunctionTemplate>(CreateSsl)).ToLocalChecked());
   Nan::Set(ctr, Nan::New("createComposite").ToLocalChecked(),
            Nan::GetFunction(
                Nan::New<FunctionTemplate>(CreateComposite)).ToLocalChecked());
-  Nan::Set(ctr, Nan::New("createGce").ToLocalChecked(),
-           Nan::GetFunction(
-               Nan::New<FunctionTemplate>(CreateGce)).ToLocalChecked());
-  Nan::Set(ctr, Nan::New("createIam").ToLocalChecked(),
-           Nan::GetFunction(
-               Nan::New<FunctionTemplate>(CreateIam)).ToLocalChecked());
   Nan::Set(ctr, Nan::New("createInsecure").ToLocalChecked(),
            Nan::GetFunction(
                Nan::New<FunctionTemplate>(CreateInsecure)).ToLocalChecked());
@@ -153,15 +144,6 @@ NAN_METHOD(Credentials::New) {
   }
 }
 
-NAN_METHOD(Credentials::CreateDefault) {
-  grpc_credentials *creds = grpc_google_default_credentials_create();
-  if (creds == NULL) {
-    info.GetReturnValue().SetNull();
-  } else {
-    info.GetReturnValue().Set(WrapStruct(creds));
-  }
-}
-
 NAN_METHOD(Credentials::CreateSsl) {
   char *root_certs = NULL;
   grpc_ssl_pem_key_cert_pair key_cert_pair = {NULL, NULL};
@@ -222,34 +204,6 @@ NAN_METHOD(Credentials::CreateComposite) {
   }
 }
 
-NAN_METHOD(Credentials::CreateGce) {
-  Nan::HandleScope scope;
-  grpc_credentials *creds = grpc_google_compute_engine_credentials_create(NULL);
-  if (creds == NULL) {
-    info.GetReturnValue().SetNull();
-  } else {
-    info.GetReturnValue().Set(WrapStruct(creds));
-  }
-}
-
-NAN_METHOD(Credentials::CreateIam) {
-  if (!info[0]->IsString()) {
-    return Nan::ThrowTypeError("createIam's first argument must be a string");
-  }
-  if (!info[1]->IsString()) {
-    return Nan::ThrowTypeError("createIam's second argument must be a string");
-  }
-  Utf8String auth_token(info[0]);
-  Utf8String auth_selector(info[1]);
-  grpc_credentials *creds =
-      grpc_google_iam_credentials_create(*auth_token, *auth_selector, NULL);
-  if (creds == NULL) {
-    info.GetReturnValue().SetNull();
-  } else {
-    info.GetReturnValue().Set(WrapStruct(creds));
-  }
-}
-
 NAN_METHOD(Credentials::CreateInsecure) {
   info.GetReturnValue().Set(WrapStruct(NULL));
 }
diff --git a/ext/credentials.h b/ext/credentials.h
index 95a28009..fd0360ed 100644
--- a/ext/credentials.h
+++ b/ext/credentials.h
@@ -62,12 +62,8 @@ class Credentials : public Nan::ObjectWrap {
   Credentials &operator=(const Credentials &);
 
   static NAN_METHOD(New);
-  static NAN_METHOD(CreateDefault);
   static NAN_METHOD(CreateSsl);
   static NAN_METHOD(CreateComposite);
-  static NAN_METHOD(CreateGce);
-  static NAN_METHOD(CreateFake);
-  static NAN_METHOD(CreateIam);
   static NAN_METHOD(CreateInsecure);
   static NAN_METHOD(CreateFromPlugin);
   static Nan::Callback *constructor;
diff --git a/test/credentials_test.js b/test/credentials_test.js
index 23f01f86..e84ade68 100644
--- a/test/credentials_test.js
+++ b/test/credentials_test.js
@@ -60,7 +60,7 @@ function multiDone(done, count) {
   };
 }
 
-describe.only('client credentials', function() {
+describe('client credentials', function() {
   var Client;
   var server;
   var port;