Skip to content

Commit bb57212

Browse files
authored
Merge pull request #18 from bigchaindb/fix/dependencies
Fix eslint dependencies
2 parents d873dda + 4d4b7ee commit bb57212

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

package.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
"version": "1.0.1",
44
"main": "./dist/node/index.js",
55
"browser": "./dist/browser/bigchaindb-graphql.cjs2.min.js",
6+
"repository": {
7+
"type": "git",
8+
"url": "git+https://github.com/bigchaindb/js-bigchaindb-graphql.git"
9+
},
10+
"license": "Apache-2.0",
611
"dependencies": {
712
"bigchaindb-driver": "^0.3.0",
813
"bip39": "^2.3.1",
@@ -11,14 +16,14 @@
1116
},
1217
"devDependencies": {
1318
"babel-cli": "^6.24.1",
14-
"babel-eslint": "^8.0.0",
19+
"babel-eslint": "^8.0.3",
1520
"babel-loader": "^7.1.1",
1621
"babel-preset-es2015": "^6.24.1",
1722
"cross-env": "^5.0.3",
18-
"eslint": "^4.3.0",
19-
"eslint-config-ascribe": "^3.0.4",
20-
"eslint-plugin-import": "^2.7.0",
21-
"release-it": "^5.0.0",
23+
"eslint": "^4.13.1",
24+
"eslint-config-ascribe": "^3.0.5",
25+
"eslint-plugin-import": "^2.8.0",
26+
"release-it": "^5.1.2",
2227
"rimraf": "^2.5.4",
2328
"webpack": "^3.4.1"
2429
},
@@ -31,8 +36,8 @@
3136
"clean": "rimraf dist/bundle dist/node",
3237
"test": "npm run lint && ./node_modules/babel-cli/bin/babel-node.js ./test/queries.js",
3338
"prepublishOnly": "npm update && npm run build",
34-
"release": "./node_modules/release-it/bin/release.js --src.tagName='v%s' --github.release --npm.publish --non-interactive",
35-
"release-minor": "./node_modules/release-it/bin/release.js minor --src.tagName='v%s' --github.release --npm.publish --non-interactive",
36-
"release-major": "./node_modules/release-it/bin/release.js major --src.tagName='v%s' --github.release --npm.publish --non-interactive"
39+
"release": "./node_modules/release-it/bin/release-it.js --src.tagName='v%s' --github.release --npm.publish --non-interactive",
40+
"release-minor": "./node_modules/release-it/bin/release-it.js minor --src.tagName='v%s' --github.release --npm.publish --non-interactive",
41+
"release-major": "./node_modules/release-it/bin/release-it.js major --src.tagName='v%s' --github.release --npm.publish --non-interactive"
3742
}
3843
}

src/conn.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ export default class BigchainDBGraphQLConnection {
2626

2727
listBlocks(transactionId) {
2828
return this.conn.listBlocks(transactionId)
29-
.then(blockIds => Promise.all(
30-
blockIds.map(blockId => this.conn.getBlock(blockId))
31-
))
29+
.then(blockIds => Promise.all(blockIds.map(blockId => this.conn.getBlock(blockId))))
3230
}
3331

3432
listVotes(blockId) {
@@ -37,9 +35,7 @@ export default class BigchainDBGraphQLConnection {
3735

3836
searchAssets(text) {
3937
return this.conn.searchAssets(text)
40-
.then(assetList => Promise.all(
41-
assetList.map(asset => this.conn.getTransaction(asset.id))
42-
))
38+
.then(assetList => Promise.all(assetList.map(asset => this.conn.getTransaction(asset.id))))
4339
}
4440

4541
createTransaction(publicKey, privateKey, asset, metadata) {
@@ -48,8 +44,7 @@ export default class BigchainDBGraphQLConnection {
4844
asset,
4945
metadata,
5046
[
51-
driver.Transaction.makeOutput(
52-
driver.Transaction.makeEd25519Condition(publicKey))
47+
driver.Transaction.makeOutput(driver.Transaction.makeEd25519Condition(publicKey))
5348
],
5449
publicKey
5550
)
@@ -68,9 +63,7 @@ export default class BigchainDBGraphQLConnection {
6863
tx,
6964
metadata,
7065
[
71-
driver.Transaction.makeOutput(
72-
driver.Transaction.makeEd25519Condition(toPublicKey)
73-
)
66+
driver.Transaction.makeOutput(driver.Transaction.makeEd25519Condition(toPublicKey))
7467
],
7568
0
7669
)

src/schema.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export default class BigchainDBGraphQLSchema {
123123
asset_id: { type: GraphQLString },
124124
operation: { type: GraphQLString }
125125
},
126-
resolve(root, { asset_id, operation }) {
126+
resolve(root, { asset_id, operation }) { // eslint-disable-line camelcase
127127
return conn.listTransactions(asset_id, operation)
128128
}
129129
},
@@ -133,7 +133,7 @@ export default class BigchainDBGraphQLSchema {
133133
public_key: { type: GraphQLString },
134134
spent: { type: GraphQLBoolean }
135135
},
136-
resolve(root, { public_key, spent }) {
136+
resolve(root, { public_key, spent }) { // eslint-disable-line camelcase
137137
return conn.listOutputs(public_key, spent)
138138
}
139139
},
@@ -152,7 +152,7 @@ export default class BigchainDBGraphQLSchema {
152152
transaction_id: { type: GraphQLString },
153153
status: { type: GraphQLString },
154154
},
155-
resolve(root, { transaction_id, status }) {
155+
resolve(root, { transaction_id, status }) { // eslint-disable-line camelcase
156156
return conn.listBlocks(transaction_id, status)
157157
}
158158
},
@@ -161,7 +161,7 @@ export default class BigchainDBGraphQLSchema {
161161
args: {
162162
block_id: { type: GraphQLString },
163163
},
164-
resolve(root, { block_id }) {
164+
resolve(root, { block_id }) { // eslint-disable-line camelcase
165165
return conn.listVotes(block_id)
166166
}
167167
},
@@ -188,7 +188,9 @@ export default class BigchainDBGraphQLSchema {
188188
asset: { type: GraphQLString },
189189
metadata: { type: GraphQLString }
190190
},
191-
resolve(root, { publicKey, privateKey, asset, metadata }) {
191+
resolve(root, {
192+
publicKey, privateKey, asset, metadata
193+
}) {
192194
return conn.createTransaction(
193195
publicKey,
194196
privateKey,
@@ -211,8 +213,8 @@ export default class BigchainDBGraphQLSchema {
211213
fromPublicKey,
212214
fromPrivateKey,
213215
toPublicKey,
214-
metadata }
215-
) {
216+
metadata
217+
}) {
216218
return conn.transferTransaction(
217219
JSON.parse(decodeURIComponent(tx)),
218220
fromPublicKey,

0 commit comments

Comments
 (0)