diff --git a/bin/ci.sh b/bin/ci.sh index f9489697..99f060c6 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -5,10 +5,13 @@ TOTAL_NODES="$2" typecheck() { npm install -g flow-bin + flow --version npm run typecheck } lint() { + echo "eslint $(node_modules/.bin/eslint --version)" + npm list babel-eslint | grep babel-eslint REPO_URL="https://raw.githubusercontent.com/ripple/javascript-style-guide" curl "$REPO_URL/es6/eslintrc" > ./eslintrc echo "parser: babel-eslint" >> ./eslintrc diff --git a/src/api/common/index.js b/src/api/common/index.js index 75b36f18..5caedaa3 100644 --- a/src/api/common/index.js +++ b/src/api/common/index.js @@ -9,7 +9,7 @@ module.exports = { dropsToXrp: utils.dropsToXrp, xrpToDrops: utils.xrpToDrops, toRippledAmount: utils.toRippledAmount, - generateWallet: utils.generateWallet, + generateAddress: utils.generateAddress, composeAsync: utils.composeAsync, wrapCatch: utils.wrapCatch, convertExceptions: utils.convertExceptions, diff --git a/src/api/common/utils.js b/src/api/common/utils.js index d565f633..b968ad50 100644 --- a/src/api/common/utils.js +++ b/src/api/common/utils.js @@ -28,7 +28,7 @@ function toRippledAmount(amount: Amount): string|Amount { }; } -function generateWallet(options?: Object): Object { +function generateAddress(options?: Object): Object { const {accountID, seed} = keypairs.generateWallet(options); return {secret: seed, address: accountID}; } @@ -92,7 +92,7 @@ function convertKeysFromSnakeCaseToCamelCase(obj: any): any { return obj; } -function promisify(asyncFunction: AsyncFunction): Function { +function promisify(asyncFunction: AsyncFunction): Function { return es6promisify(wrapCatch(asyncFunction)); } @@ -101,7 +101,7 @@ module.exports = { dropsToXrp, xrpToDrops, toRippledAmount, - generateWallet, + generateAddress, composeAsync, wrapCatch, convertExceptions, diff --git a/src/api/index.js b/src/api/index.js index 07bda88f..f88951cf 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -28,7 +28,7 @@ const sign = require('./transaction/sign'); const submit = require('./transaction/submit'); const errors = require('./common').errors; const convertExceptions = require('./common').convertExceptions; -const generateWallet = convertExceptions(common.generateWallet); +const generateAddress = convertExceptions(common.generateAddress); const computeLedgerHash = require('./offline/ledgerhash'); const getLedger = require('./ledger/ledger'); const isValidAddress = common.isValidAddress; @@ -67,7 +67,7 @@ RippleAPI.prototype = { computeLedgerHash, isValidAddress, - generateWallet, + generateAddress, errors }; diff --git a/test/api-test.js b/test/api-test.js index 0bd81dfa..9f3afc3b 100644 --- a/test/api-test.js +++ b/test/api-test.js @@ -404,12 +404,12 @@ describe('RippleAPI', function() { _.partial(checkResult, responses.getTrustlines, 'getTrustlines')); }); - it('generateWallet', function() { + it('generateAddress', function() { function random() { return _.fill(Array(16), 0); } - assert.deepEqual(this.api.generateWallet({random}), - responses.generateWallet); + assert.deepEqual(this.api.generateAddress({random}), + responses.generateAddress); }); it('getSettings', function() { @@ -597,7 +597,7 @@ describe('RippleAPI', function() { it('ledger utils - getRecursive', function(done) { function getter(marker, limit, callback) { if (marker === undefined) { - callback(null, {marker: 'A', results: [1]}); + callback(null, {marker: 'A', limit: limit, results: [1]}); } else { callback(new Error(), null); } diff --git a/test/fixtures/api/responses/generate-wallet.json b/test/fixtures/api/responses/generate-address.json similarity index 100% rename from test/fixtures/api/responses/generate-wallet.json rename to test/fixtures/api/responses/generate-address.json diff --git a/test/fixtures/api/responses/index.js b/test/fixtures/api/responses/index.js index 7ea9e488..128aec72 100644 --- a/test/fixtures/api/responses/index.js +++ b/test/fixtures/api/responses/index.js @@ -1,7 +1,7 @@ 'use strict'; module.exports = { - generateWallet: require('./generate-wallet.json'), + generateAddress: require('./generate-address.json'), getAccountInfo: require('./get-account-info.json'), getBalances: require('./get-balances.json'), getOrderbook: require('./get-orderbook.json'),