ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-12-06 17:27:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove computeLedgerHash and isValidAddress from API

Browse Source
This commit is contained in:
Chris Clark
2015-08-26 15:55:15 -07:00
parent e3787e0f4f
commit 15c0e6db19
4 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/common/index.js
View File

@@ -16,6 +16,5 @@ module.exports = {
convertExceptions: utils.convertExceptions, convertExceptions: utils.convertExceptions,
convertKeysFromSnakeCaseToCamelCase: convertKeysFromSnakeCaseToCamelCase:
utils.convertKeysFromSnakeCaseToCamelCase, utils.convertKeysFromSnakeCaseToCamelCase,
promisify: utils.promisify, promisify: utils.promisify
isValidAddress: require('./schema-validator').isValidAddress
}; };

1
src/api/common/schema-validator.js
View File

@@ -70,7 +70,6 @@ function schemaValidate(schemaName: string, object: any): void {
SCHEMAS = loadSchemas(path.join(__dirname, './schemas')); SCHEMAS = loadSchemas(path.join(__dirname, './schemas'));
module.exports = { module.exports = {
schemaValidate: schemaValidate, schemaValidate: schemaValidate,
isValidAddress: isValidAddress,
loadSchema: loadSchema, loadSchema: loadSchema,
SCHEMAS: SCHEMAS SCHEMAS: SCHEMAS
}; };

6
src/api/index.js
View File

@@ -31,7 +31,6 @@ const convertExceptions = require('./common').convertExceptions;
const generateAddress = convertExceptions(common.generateAddress); const generateAddress = convertExceptions(common.generateAddress);
const computeLedgerHash = require('./offline/ledgerhash'); const computeLedgerHash = require('./offline/ledgerhash');
const getLedger = require('./ledger/ledger'); const getLedger = require('./ledger/ledger');
const isValidAddress = common.isValidAddress;
function RippleAPI(options: {}) { function RippleAPI(options: {}) {
common.validate.remoteOptions(options); common.validate.remoteOptions(options);
@@ -66,15 +65,14 @@ RippleAPI.prototype = {
sign, sign,
submit, submit,
computeLedgerHash,
isValidAddress,
generateAddress, generateAddress,
errors errors
}; };
// these are exposed only for use by unit tests; they are not part of the API // these are exposed only for use by unit tests; they are not part of the API
RippleAPI._PRIVATE = { RippleAPI._PRIVATE = {
common: common, common,
computeLedgerHash,
ledgerUtils: require('./ledger/utils'), ledgerUtils: require('./ledger/utils'),
schemaValidator: require('./common/schema-validator') schemaValidator: require('./common/schema-validator')
}; };

27
test/api-test.js
View File

@@ -581,7 +581,7 @@ describe('RippleAPI', function() {
.then(response => { .then(response => {
const ledger = _.assign({}, response, const ledger = _.assign({}, response,
{parentCloseTime: response.closeTime}); {parentCloseTime: response.closeTime});
const hash = this.api.computeLedgerHash(ledger); const hash = RippleAPI._PRIVATE.computeLedgerHash(ledger);
assert.strictEqual(hash, assert.strictEqual(hash,
'E6DB7365949BF9814D76BCC730B01818EB9136A89DB224F3F9F5AAE4569D758E'); 'E6DB7365949BF9814D76BCC730B01818EB9136A89DB224F3F9F5AAE4569D758E');
}); });
@@ -782,48 +782,29 @@ describe('RippleAPI - offline', function() {
}); });
it('computeLedgerHash', function() { it('computeLedgerHash', function() {
const api = new RippleAPI();
const header = requests.computeLedgerHash.header; const header = requests.computeLedgerHash.header;
const ledgerHash = api.computeLedgerHash(header); const ledgerHash = RippleAPI._PRIVATE.computeLedgerHash(header);
assert.strictEqual(ledgerHash, assert.strictEqual(ledgerHash,
'F4D865D83EB88C1A1911B9E90641919A1314F36E1B099F8E95FE3B7C77BE3349'); 'F4D865D83EB88C1A1911B9E90641919A1314F36E1B099F8E95FE3B7C77BE3349');
}); });
it('computeLedgerHash - with transactions', function() { it('computeLedgerHash - with transactions', function() {
const api = new RippleAPI();
const header = _.omit(requests.computeLedgerHash.header, const header = _.omit(requests.computeLedgerHash.header,
'transactionHash'); 'transactionHash');
header.rawTransactions = JSON.stringify( header.rawTransactions = JSON.stringify(
requests.computeLedgerHash.transactions); requests.computeLedgerHash.transactions);
const ledgerHash = api.computeLedgerHash(header); const ledgerHash = RippleAPI._PRIVATE.computeLedgerHash(header);
assert.strictEqual(ledgerHash, assert.strictEqual(ledgerHash,
'F4D865D83EB88C1A1911B9E90641919A1314F36E1B099F8E95FE3B7C77BE3349'); 'F4D865D83EB88C1A1911B9E90641919A1314F36E1B099F8E95FE3B7C77BE3349');
}); });
it('computeLedgerHash - incorrent transaction_hash', function() { it('computeLedgerHash - incorrent transaction_hash', function() {
const api = new RippleAPI();
const header = _.assign({}, requests.computeLedgerHash.header, const header = _.assign({}, requests.computeLedgerHash.header,
{transactionHash: {transactionHash:
'325EACC5271322539EEEC2D6A5292471EF1B3E72AE7180533EFC3B8F0AD435C9'}); '325EACC5271322539EEEC2D6A5292471EF1B3E72AE7180533EFC3B8F0AD435C9'});
header.rawTransactions = JSON.stringify( header.rawTransactions = JSON.stringify(
requests.computeLedgerHash.transactions); requests.computeLedgerHash.transactions);
assert.throws(() => api.computeLedgerHash(header)); assert.throws(() => RippleAPI._PRIVATE.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));
}); });
/* eslint-disable no-unused-vars */ /* eslint-disable no-unused-vars */