Skip to content
This repository was archived by the owner on Dec 1, 2024. It is now read-only.

Commit d9ff554

Browse files
vweeversvweevers
authored
Replace async devDependency with async-each and run-* (#654)
1 parent 6a033f1 commit d9ff554

8 files changed

Lines changed: 41 additions & 34 deletions

File tree

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"devDependencies": {
2323
"after": "^0.8.2",
2424
"airtap": "^2.0.0",
25-
"async": "^2.5.0",
25+
"async-each": "^1.0.3",
2626
"bl": "^3.0.0",
2727
"browserify": "^16.0.0",
2828
"bustermove": "^1.0.0",
@@ -37,6 +37,8 @@
3737
"nyc": "^14.0.0",
3838
"pinkie": "^2.0.4",
3939
"referee": "^1.2.0",
40+
"run-parallel": "^1.1.9",
41+
"run-series": "^1.1.8",
4042
"safe-buffer": "^5.1.0",
4143
"standard": "^12.0.0",
4244
"tape": "^4.7.0",

‎test/batch-test.js‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var levelup = require('../lib/levelup')
22
var errors = levelup.errors
3-
var async = require('async')
3+
var each = require('async-each')
4+
var series = require('run-series')
45
var common = require('./common')
56
var assert = require('referee').assert
67
var refute = require('referee').refute
@@ -18,7 +19,7 @@ buster.testCase('batch()', {
1819
{ type: 'put', key: 'baz', value: 'abazvalue' }
1920
], function (err) {
2021
refute(err)
21-
async.forEach(['foo', 'bar', 'baz'], function (key, callback) {
22+
each(['foo', 'bar', 'baz'], function (key, callback) {
2223
db.get(key, function (err, value) {
2324
refute(err)
2425
assert.equals(value, 'a' + key + 'value')
@@ -37,7 +38,7 @@ buster.testCase('batch()', {
3738
{ type: 'put', key: 'baz', value: 'abazvalue' }
3839
])
3940
.then(function () {
40-
async.forEach(['foo', 'bar', 'baz'], function (key, callback) {
41+
each(['foo', 'bar', 'baz'], function (key, callback) {
4142
db.get(key, function (err, value) {
4243
refute(err)
4344
assert.equals(value, 'a' + key + 'value')
@@ -51,7 +52,7 @@ buster.testCase('batch()', {
5152

5253
'batch() with multiple puts and deletes': function (done) {
5354
this.openTestDatabase(function (db) {
54-
async.series([
55+
series([
5556
function (callback) {
5657
db.batch([
5758
{ type: 'put', key: '1', value: 'one' },
@@ -70,7 +71,7 @@ buster.testCase('batch()', {
7071
},
7172
function (callback) {
7273
// these should exist
73-
async.forEach(['2', '3', 'bar', 'baz'], function (key, callback) {
74+
each(['2', '3', 'bar', 'baz'], function (key, callback) {
7475
db.get(key, function (err, value) {
7576
refute(err)
7677
refute.isNull(value)
@@ -80,7 +81,7 @@ buster.testCase('batch()', {
8081
},
8182
function (callback) {
8283
// these shouldn't exist
83-
async.forEach(['1', 'foo'], function (key, callback) {
84+
each(['1', 'foo'], function (key, callback) {
8485
db.get(key, function (err, value) {
8586
assert(err)
8687
assert.isInstanceOf(err, errors.NotFoundError)
@@ -110,7 +111,7 @@ buster.testCase('batch()', {
110111
.write(function (err) {
111112
refute(err)
112113

113-
async.forEach([ 'one', 'three', '1', '2', '3' ], function (key, callback) {
114+
each([ 'one', 'three', '1', '2', '3' ], function (key, callback) {
114115
db.get(key, function (err) {
115116
if ([ 'one', 'three', '1', '3' ].indexOf(key) > -1) { assert(err) } else { refute(err) }
116117
callback()
@@ -172,7 +173,7 @@ buster.testCase('batch()', {
172173
.del('3')
173174
.write()
174175
.then(function () {
175-
async.forEach([ 'one', 'three', '1', '2', '3' ], function (key, callback) {
176+
each([ 'one', 'three', '1', '2', '3' ], function (key, callback) {
176177
db.get(key, function (err) {
177178
if ([ 'one', 'three', '1', '3' ].indexOf(key) > -1) { assert(err) } else { refute(err) }
178179
callback()
@@ -206,7 +207,7 @@ buster.testCase('batch()', {
206207
'batch() with can manipulate data from put()': function (done) {
207208
// checks encoding and whatnot
208209
this.openTestDatabase(function (db) {
209-
async.series(
210+
series(
210211
[
211212
db.put.bind(db, '1', 'one'),
212213
db.put.bind(db, '2', 'two'),
@@ -222,7 +223,7 @@ buster.testCase('batch()', {
222223
},
223224
function (callback) {
224225
// these should exist
225-
async.forEach(['2', '3', 'bar', 'baz'], function (key, callback) {
226+
each(['2', '3', 'bar', 'baz'], function (key, callback) {
226227
db.get(key, function (err, value) {
227228
refute(err)
228229
refute.isNull(value)
@@ -232,7 +233,7 @@ buster.testCase('batch()', {
232233
},
233234
function (callback) {
234235
// these shouldn't exist
235-
async.forEach(['1', 'foo'], function (key, callback) {
236+
each(['1', 'foo'], function (key, callback) {
236237
db.get(key, function (err, value) {
237238
assert(err)
238239
assert.isInstanceOf(err, errors.NotFoundError)
@@ -247,7 +248,7 @@ buster.testCase('batch()', {
247248

248249
'batch() data can be read with get() and del()': function (done) {
249250
this.openTestDatabase(function (db) {
250-
async.series([
251+
series([
251252
function (callback) {
252253
db.batch([
253254
{ type: 'put', key: '1', value: 'one' },
@@ -258,7 +259,7 @@ buster.testCase('batch()', {
258259
db.del.bind(db, '1', 'one'),
259260
function (callback) {
260261
// these should exist
261-
async.forEach(['2', '3'], function (key, callback) {
262+
each(['2', '3'], function (key, callback) {
262263
db.get(key, function (err, value) {
263264
refute(err)
264265
refute.isNull(value)

‎test/binary-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var async = require('async')
1+
var each = require('async-each')
22
var common = require('./common')
33
var assert = require('referee').assert
44
var refute = require('referee').refute
@@ -140,7 +140,7 @@ buster.testCase('Binary API', {
140140
{ type: 'put', key: 'baz', value: 'abazvalue' }
141141
], { keyEncoding: 'utf8', valueEncoding: 'binary' }, function (err) {
142142
refute(err)
143-
async.forEach(['foo', 'bar', 'baz'], function (key, callback) {
143+
each(['foo', 'bar', 'baz'], function (key, callback) {
144144
db.get(key, { valueEncoding: 'binary' }, function (err, value) {
145145
refute(err)
146146
if (key === 'baz') {

‎test/common.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var referee = require('referee')
22
var assert = referee.assert
33
var refute = referee.refute
4-
var async = require('async')
4+
var each = require('async-each')
55
var delayed = require('delayed').delayed
66
var levelup = require('../lib/levelup.js')
77
var errors = require('level-errors')
@@ -46,7 +46,7 @@ module.exports.openTestDatabase = function () {
4646
}
4747

4848
module.exports.commonTearDown = function (done) {
49-
async.forEach(this.closeableDatabases, function (db, callback) {
49+
each(this.closeableDatabases, function (db, callback) {
5050
db.close(callback)
5151
}, done)
5252
}

‎test/deferred-open-test.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
var levelup = require('../lib/levelup.js')
22
var memdown = require('memdown')
33
var encDown = require('encoding-down')
4-
var async = require('async')
4+
var each = require('async-each')
5+
var parallel = require('run-parallel')
56
var concat = require('concat-stream')
67
var common = require('./common')
78
var assert = require('referee').assert
@@ -19,15 +20,15 @@ buster.testCase('Deferred open()', {
1920
this.closeableDatabases.push(db)
2021
assert.isObject(db)
2122

22-
async.parallel([
23+
parallel([
2324
// 2) insert 3 values with put(), these should be deferred until the database is actually open
2425
db.put.bind(db, 'k1', 'v1'),
2526
db.put.bind(db, 'k2', 'v2'),
2627
db.put.bind(db, 'k3', 'v3')
2728
], function () {
2829
// 3) when the callbacks have returned, the database should be open and those values should be in
2930
// verify that the values are there
30-
async.forEach([1, 2, 3], function (k, cb) {
31+
each([1, 2, 3], function (k, cb) {
3132
db.get('k' + k, function (err, v) {
3233
refute(err)
3334
assert.equals(v, 'v' + k)
@@ -62,7 +63,7 @@ buster.testCase('Deferred open()', {
6263
], function () {
6364
// 3) when the callbacks have returned, the database should be open and those values should be in
6465
// verify that the values are there
65-
async.forEach([1, 2, 3], function (k, cb) {
66+
each([1, 2, 3], function (k, cb) {
6667
db.get('k' + k, function (err, v) {
6768
refute(err)
6869
assert.equals(v, 'v' + k)
@@ -97,7 +98,7 @@ buster.testCase('Deferred open()', {
9798
.write(function () {
9899
// 3) when the callbacks have returned, the database should be open and those values should be in
99100
// verify that the values are there
100-
async.forEach([1, 2, 3], function (k, cb) {
101+
each([1, 2, 3], function (k, cb) {
101102
db.get('k' + k, function (err, v) {
102103
refute(err)
103104
assert.equals(v, 'v' + k)

‎test/get-put-del-test.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var levelup = require('../lib/levelup.js')
22
var errors = levelup.errors
3-
var async = require('async')
3+
var each = require('async-each')
4+
var series = require('run-series')
45
var common = require('./common')
56
var assert = require('referee').assert
67
var refute = require('referee').refute
@@ -86,17 +87,17 @@ buster.testCase('get() / put() / del()', {
8687

8788
'del() works on real entries': function (done) {
8889
this.openTestDatabase(function (db) {
89-
async.series([
90+
series([
9091
function (callback) {
91-
async.forEach(['foo', 'bar', 'baz'], function (key, callback) {
92+
each(['foo', 'bar', 'baz'], function (key, callback) {
9293
db.put(key, 1 + Math.random(), callback)
9394
}, callback)
9495
},
9596
function (callback) {
9697
db.del('bar', callback)
9798
},
9899
function (callback) {
99-
async.forEach(['foo', 'bar', 'baz'], function (key, callback) {
100+
each(['foo', 'bar', 'baz'], function (key, callback) {
100101
db.get(key, function (err, value) {
101102
// we should get foo & baz but not bar
102103
if (key === 'bar') {

‎test/inject-encoding-test.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
var levelup = require('../lib/levelup.js')
22
var memdown = require('memdown')
33
var encDown = require('encoding-down')
4-
var async = require('async')
4+
var each = require('async-each')
5+
var parallel = require('run-parallel')
56
var common = require('./common')
67
var assert = require('referee').assert
78
var refute = require('referee').refute
@@ -28,9 +29,9 @@ buster.testCase('custom encoding', {
2829
this.closeableDatabases.push(db)
2930

3031
var PUT = testData.map(function (d) { return db.put.bind(db, d.key, d.value) })
31-
async.parallel(PUT, function (err) {
32+
parallel(PUT, function (err) {
3233
refute(err)
33-
async.forEach(testData, function (d, callback) {
34+
each(testData, function (d, callback) {
3435
db.get(d.key, function (err, value) {
3536
if (err) console.error(err.stack)
3637
refute(err)

‎test/json-test.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
var levelup = require('../lib/levelup.js')
22
var memdown = require('memdown')
33
var encDown = require('encoding-down')
4-
var async = require('async')
4+
var each = require('async-each')
5+
var parallel = require('run-parallel')
56
var concat = require('concat-stream')
67
var common = require('./common')
78
var assert = require('referee').assert
@@ -22,13 +23,13 @@ buster.testCase('JSON encoding', {
2223
this.closeableDatabases.push(db)
2324

2425
var PUT = testData.map(function (d) { return db.put.bind(db, d.key, d.value) })
25-
async.parallel(PUT, function (err) {
26+
parallel(PUT, function (err) {
2627
refute(err)
27-
async.parallel([testGet, testStream], done)
28+
parallel([testGet, testStream], done)
2829
})
2930

3031
function testGet (next) {
31-
async.forEach(testData, function (d, callback) {
32+
each(testData, function (d, callback) {
3233
db.get(d.key, function (err, value) {
3334
if (err) console.error(err.stack)
3435
refute(err)

0 commit comments

Comments
 (0)
⚡