Merge 9086ffa into f25441f

storj-archived · Nov 16, 2017 · e4c06bc · e4c06bc
2 parents f25441f + 9086ffa
commit e4c06bc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/lib/models/payment-processor-adapters/coinpayments.js b/lib/models/payment-processor-adapters/coinpayments.js
@@ -16,7 +16,7 @@ const coinpaymentsAdapter = {
 
   addPaymentMethod: function (token) {
     return new Promise((resolve, reject) => {
-      coinpayments.getCallbackAddress(token, function(err, data) {
+      coinpayments().getCallbackAddress(token, function(err, data) {
         if (err) {
           reject(err);
         }

diff --git a/lib/vendor/coinpayments.js b/lib/vendor/coinpayments.js
@@ -7,16 +7,13 @@ const options = {
 
 let client;
 
-try {
-  client = new Coinpayments(options);
-} catch (err) {
-  if (err.message === 'Missing public key and/or secret') {
-    console.error(err.message);
-    return;
-  } else {
-    throw(err);
-  }
-}
+const getClient = function () {
+    if (client) {
+        return client;
+    }
 
+    client = new Coinpayments(options);
+    return client;
+};
 
-module.exports = client;
+module.exports = getClient;
diff --git a/test/payment-processor-adapters/coinpayments.js b/test/payment-processor-adapters/coinpayments.js
@@ -14,8 +14,10 @@ describe('Storage/models/PaymentProcessor/coinpayments', function () {
         address: '0x703faaa2f42291e0aaa9ffdbd74ae81172895bc7'
       };
       const Adapter = proxyquire(libPath, {
-        '../../vendor/coinpayments': {
-          getCallbackAddress: sinon.stub().callsArgWith(1, null, data)
+        '../../vendor/coinpayments': function () {
+          return {
+            getCallbackAddress: sinon.stub().callsArgWith(1, null, data)
+          }
         }
       });
       const paymentProcessor = {
@@ -41,8 +43,10 @@ describe('Storage/models/PaymentProcessor/coinpayments', function () {
         address: '0x703faaa2f42291e0aaa9ffdbd74ae81172895bc7'
       };
       const Adapter = proxyquire(libPath, {
-        '../../vendor/coinpayments': {
-          getCallbackAddress: sinon.stub().callsArgWith(1, null, data)
+        '../../vendor/coinpayments': function () {
+          return {
+            getCallbackAddress: sinon.stub().callsArgWith(1, null, data)
+          }
         }
       });
       const paymentProcessor = {
@@ -67,8 +71,10 @@ describe('Storage/models/PaymentProcessor/coinpayments', function () {
         address: '0x703faaa2f42291e0aaa9ffdbd74ae81172895bc7'
       };
       const Adapter = proxyquire(libPath, {
-        '../../vendor/coinpayments': {
-          getCallbackAddress: sinon.stub().callsArgWith(1, null, data)
+        '../../vendor/coinpayments': function () {
+          return {
+            getCallbackAddress: sinon.stub().callsArgWith(1, null, data)
+          }
         }
       });
       const paymentProcessor = {
@@ -99,8 +105,10 @@ describe('Storage/models/PaymentProcessor/coinpayments', function () {
         address: '0x703faaa2f42291e0aaa9ffdbd74ae81172895bc7'
       };
       const Adapter = proxyquire(libPath, {
-        '../../vendor/coinpayments': {
-          getCallbackAddress: sinon.stub().callsArgWith(1, null, data)
+        '../../vendor/coinpayments': function () {
+          return {
+            getCallbackAddress: sinon.stub().callsArgWith(1, null, data)
+          }
         }
       });
       const paymentProcessor = {