diff --git a/circle.yml b/circle.yml index 2e46f661..ce1640bc 100644 --- a/circle.yml +++ b/circle.yml @@ -1,11 +1,10 @@ machine: node: - version: 0.12.0 + version: 6.11.3 hosts: testripple.circleci.com: 127.0.0.1 dependencies: pre: - - npm -g install npm@latest-2 - wget https://s3-us-west-2.amazonaws.com/ripple-debs/rippled_0.30.1-b11-1.deb - sudo dpkg -i rippled_0.30.1-b11-1.deb test: diff --git a/package.json b/package.json index f4f85c89..1f10dc91 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "babel-preset-es2015": "^6.3.13", "babel-preset-stage-1": "^6.3.13", "babel-register": "^6.3.13", - "coveralls": "^2.11.9", + "coveralls": "^2.13.1", "doctoc": "^0.15.0", "ejs": "^2.3.4", "eslint": "^2.9.0", diff --git a/scripts/ci.sh b/scripts/ci.sh index 549ef11b..13ac20b1 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -29,7 +29,7 @@ unittest() { npm run coveralls # test compiled version in "dist/npm" - babel -D --optional runtime --ignore "**/node_modules/**" -d test-compiled/ test/ + $(npm bin)/babel -D --optional runtime --ignore "**/node_modules/**" -d test-compiled/ test/ echo "--reporter spec --timeout 5000 --slow 500" > test-compiled/mocha.opts mkdir -p test-compiled/node_modules ln -nfs ../../dist/npm test-compiled/node_modules/ripple-api diff --git a/src/transaction/utils.js b/src/transaction/utils.js index f12b8905..679ecacd 100644 --- a/src/transaction/utils.js +++ b/src/transaction/utils.js @@ -27,7 +27,7 @@ function setCanonicalFlag(txJSON) { txJSON.Flags = txJSON.Flags >>> 0 } -function scaleValue(value, multiplier, extra=0) { +function scaleValue(value, multiplier, extra = 0) { return (new BigNumber(value)).times(multiplier).plus(extra).toString() } @@ -73,7 +73,7 @@ function prepareTransaction(txJSON: Object, api: Object, if (instructions.maxFee !== undefined) { const maxFeeDrops = common.xrpToDrops(instructions.maxFee) const normalFee = scaleValue(feeDrops, multiplier, extraFee) - txJSON.Fee = BigNumber.min(normalFee, maxFeeDrops).toString(); + txJSON.Fee = BigNumber.min(normalFee, maxFeeDrops).toString() } else { txJSON.Fee = scaleValue(feeDrops, multiplier, extraFee) }