bigchaindb/js-bigchaindb-driver
1
0
Fork 0
mirror of https://github.com/bigchaindb/js-bigchaindb-driver.git synced 2024-06-28 16:47:45 +02:00
Code Releases Activity

Merge branch 'greenkeeper/eslint-4.1.1'

Browse Source
This commit is contained in:
vrde 2017-07-05 17:58:21 +02:00
commit 197ece2264
No known key found for this signature in database
GPG Key ID: 6581C7C39B3D397D
5 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -48,7 +48,7 @@
"babel-preset-latest": "^6.22.0",
"babel-runtime": "^6.22.0",
"cross-env": "^5.0.1",
"eslint": "^3.14.1",
"eslint": "^4.1.1",
"eslint-config-ascribe": "^3.0.4",
"eslint-plugin-import": "^2.2.0",
"husky": "^0.14.0",

8
src/request.js
View File

@ -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
})

4
src/sanitize.js
View File

@ -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')
}

12
src/transaction/makeTransferTransaction.js
View File

@ -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)

6
test/transaction/test_cryptoconditions.js
View File

@ -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)))
})