From a49e935b8fa06e08793387ce0ccdef8fbd5970af Mon Sep 17 00:00:00 2001 From: vrde Date: Wed, 5 Jul 2017 17:13:05 +0200 Subject: [PATCH] Fix eslint errors --- src/request.js | 8 ++------ src/sanitize.js | 4 ++-- src/transaction/makeTransferTransaction.js | 12 ++++++------ test/transaction/test_cryptoconditions.js | 6 +++--- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/request.js b/src/request.js index fab3ac9..f768ce2 100644 --- a/src/request.js +++ b/src/request.js @@ -30,12 +30,8 @@ export default function request(url, config = {}, onlyJsonResponse = true) { } return baseRequest(apiUrl, requestConfig) - .then((res) => onlyJsonResponse ? res.json() : // eslint-disable-line no-confusing-arrow - { - json: res.json(), - url: res.url - }) - .catch((err) => { + .then(res => (onlyJsonResponse ? res.json() : { json: res.json(), url: res.url })) + .catch(err => { console.error(err) throw err }) diff --git a/src/sanitize.js b/src/sanitize.js index dd3dc40..b436545 100644 --- a/src/sanitize.js +++ b/src/sanitize.js @@ -10,11 +10,11 @@ import coreObjectEntries from 'core-js/library/fn/object/entries' function filterFromObject(obj, filter, { isInclusion = true } = {}) { if (filter && Array.isArray(filter)) { return applyFilterOnObject(obj, isInclusion ? ((_, key) => coreIncludes(filter, key)) - : ((_, key) => !coreIncludes(filter, key))) + : ((_, key) => !coreIncludes(filter, key))) } else if (filter && typeof filter === 'function') { // Flip the filter fn's return if it's for inclusion return applyFilterOnObject(obj, isInclusion ? filter - : (...args) => !filter(...args)) + : (...args) => !filter(...args)) } else { throw new Error('The given filter is not an array or function. Exclude aborted') } diff --git a/src/transaction/makeTransferTransaction.js b/src/transaction/makeTransferTransaction.js index 8272b2c..3d62bd2 100644 --- a/src/transaction/makeTransferTransaction.js +++ b/src/transaction/makeTransferTransaction.js @@ -25,11 +25,11 @@ import makeTransaction from './makeTransaction' // TODO: // - Make `metadata` optional argument export default function makeTransferTransaction( - unspentTransaction, - metadata, - outputs, - ...outputIndices - ) { + unspentTransaction, + metadata, + outputs, + ...outputIndices +) { const inputs = outputIndices.map((outputIndex) => { const fulfilledOutput = unspentTransaction.outputs[outputIndex] const transactionLink = { @@ -42,7 +42,7 @@ export default function makeTransferTransaction( const assetLink = { 'id': unspentTransaction.operation === 'CREATE' ? unspentTransaction.id - : unspentTransaction.asset.id + : unspentTransaction.asset.id } return makeTransaction('TRANSFER', assetLink, metadata, outputs, inputs) diff --git a/test/transaction/test_cryptoconditions.js b/test/transaction/test_cryptoconditions.js index 3e4a263..c6bab61 100644 --- a/test/transaction/test_cryptoconditions.js +++ b/test/transaction/test_cryptoconditions.js @@ -20,7 +20,7 @@ test('Threshold condition encoding', t => { const publicKey = '4zvwRjXUKGfvwnParsHAS3HuSVzV5cA4McphgmoCtajS' const ed25519 = Transaction.makeEd25519Condition(publicKey, false) const condition = Transaction.makeThresholdCondition( - 1, [ed25519, ed25519]) + 1, [ed25519, ed25519]) const output = Transaction.makeOutput(condition) const target = { condition: { @@ -64,8 +64,8 @@ test('Fulfillment correctly formed', t => { const msg = Transaction.serializeTransactionIntoCanonicalString(txTransfer) const txSigned = Transaction.signTransaction(txTransfer, alice.privateKey) t.truthy(cc.validateFulfillment(txSigned.inputs[0].fulfillment, - txCreate.outputs[0].condition.uri, - new Buffer(msg))) + txCreate.outputs[0].condition.uri, + new Buffer(msg))) })