From 15c0e6db1939d9b259409712f0e7baecd8307e72 Mon Sep 17 00:00:00 2001
From: Chris Clark <clark@ripple.com>
Date: Wed, 26 Aug 2015 15:55:15 -0700
Subject: [PATCH] Remove computeLedgerHash and isValidAddress from API

---
 src/api/common/index.js            |  3 +--
 src/api/common/schema-validator.js |  1 -
 src/api/index.js                   |  6 ++----
 test/api-test.js                   | 27 ++++-----------------------
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/api/common/index.js b/src/api/common/index.js
index 688736e8..95f2a55f 100644
--- a/src/api/common/index.js
+++ b/src/api/common/index.js
@@ -16,6 +16,5 @@ module.exports = {
   convertExceptions: utils.convertExceptions,
   convertKeysFromSnakeCaseToCamelCase:
     utils.convertKeysFromSnakeCaseToCamelCase,
-  promisify: utils.promisify,
-  isValidAddress: require('./schema-validator').isValidAddress
+  promisify: utils.promisify
 };
diff --git a/src/api/common/schema-validator.js b/src/api/common/schema-validator.js
index e4626634..8bf739ed 100644
--- a/src/api/common/schema-validator.js
+++ b/src/api/common/schema-validator.js
@@ -70,7 +70,6 @@ function schemaValidate(schemaName: string, object: any): void {
 SCHEMAS = loadSchemas(path.join(__dirname, './schemas'));
 module.exports = {
   schemaValidate: schemaValidate,
-  isValidAddress: isValidAddress,
   loadSchema: loadSchema,
   SCHEMAS: SCHEMAS
 };
diff --git a/src/api/index.js b/src/api/index.js
index a1d6247d..68aed81d 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -31,7 +31,6 @@ const convertExceptions = require('./common').convertExceptions;
 const generateAddress = convertExceptions(common.generateAddress);
 const computeLedgerHash = require('./offline/ledgerhash');
 const getLedger = require('./ledger/ledger');
-const isValidAddress = common.isValidAddress;
 
 function RippleAPI(options: {}) {
   common.validate.remoteOptions(options);
@@ -66,15 +65,14 @@ RippleAPI.prototype = {
   sign,
   submit,
 
-  computeLedgerHash,
-  isValidAddress,
   generateAddress,
   errors
 };
 
 // these are exposed only for use by unit tests; they are not part of the API
 RippleAPI._PRIVATE = {
-  common: common,
+  common,
+  computeLedgerHash,
   ledgerUtils: require('./ledger/utils'),
   schemaValidator: require('./common/schema-validator')
 };
diff --git a/test/api-test.js b/test/api-test.js
index 53611739..2635ab9f 100644
--- a/test/api-test.js
+++ b/test/api-test.js
@@ -581,7 +581,7 @@ describe('RippleAPI', function() {
       .then(response => {
         const ledger = _.assign({}, response,
           {parentCloseTime: response.closeTime});
-        const hash = this.api.computeLedgerHash(ledger);
+        const hash = RippleAPI._PRIVATE.computeLedgerHash(ledger);
         assert.strictEqual(hash,
           'E6DB7365949BF9814D76BCC730B01818EB9136A89DB224F3F9F5AAE4569D758E');
       });
@@ -782,48 +782,29 @@ describe('RippleAPI - offline', function() {
   });
 
   it('computeLedgerHash', function() {
-    const api = new RippleAPI();
     const header = requests.computeLedgerHash.header;
-    const ledgerHash = api.computeLedgerHash(header);
+    const ledgerHash = RippleAPI._PRIVATE.computeLedgerHash(header);
     assert.strictEqual(ledgerHash,
       'F4D865D83EB88C1A1911B9E90641919A1314F36E1B099F8E95FE3B7C77BE3349');
   });
 
   it('computeLedgerHash - with transactions', function() {
-    const api = new RippleAPI();
     const header = _.omit(requests.computeLedgerHash.header,
       'transactionHash');
     header.rawTransactions = JSON.stringify(
       requests.computeLedgerHash.transactions);
-    const ledgerHash = api.computeLedgerHash(header);
+    const ledgerHash = RippleAPI._PRIVATE.computeLedgerHash(header);
     assert.strictEqual(ledgerHash,
       'F4D865D83EB88C1A1911B9E90641919A1314F36E1B099F8E95FE3B7C77BE3349');
   });
 
   it('computeLedgerHash - incorrent transaction_hash', function() {
-    const api = new RippleAPI();
     const header = _.assign({}, requests.computeLedgerHash.header,
       {transactionHash:
         '325EACC5271322539EEEC2D6A5292471EF1B3E72AE7180533EFC3B8F0AD435C9'});
     header.rawTransactions = JSON.stringify(
       requests.computeLedgerHash.transactions);
-    assert.throws(() => api.computeLedgerHash(header));
-  });
-
-  it('isValidAddress - valid', function() {
-    const api = new RippleAPI();
-    assert(api.isValidAddress(address));
-  });
-
-  it('isValidAddress - invalid', function() {
-    const api = new RippleAPI();
-    assert(!api.isValidAddress(address.slice(0, -1) + 'a'));
-  });
-
-  it('isValidAddress - invalid - hex representation', function() {
-    const api = new RippleAPI();
-    const hex = '6e3efa86a5eb0a3c5dc9beb3a204783bb00e1913';
-    assert(!api.isValidAddress(hex));
+    assert.throws(() => RippleAPI._PRIVATE.computeLedgerHash(header));
   });
 
 /* eslint-disable no-unused-vars */