Skip to content

Commit 3250ed9

Browse files
jacobheunvmx
authored andcommitted
refactor: use nextTick over setImmediate
1 parent 76ea075 commit 3250ed9

File tree

5 files changed

+16
-21
lines changed

5 files changed

+16
-21
lines changed

src/decision-engine/index.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
const each = require('async/each')
44
const eachSeries = require('async/eachSeries')
55
const waterfall = require('async/waterfall')
6-
const setImmediate = require('async/setImmediate')
76

87
const map = require('async/map')
98
const debounce = require('lodash.debounce')
@@ -71,7 +70,7 @@ class DecisionEngine {
7170
cb()
7271
})
7372
} else {
74-
setImmediate(cb)
73+
process.nextTick(cb)
7574
}
7675
}, cb)
7776
}
@@ -179,7 +178,7 @@ class DecisionEngine {
179178
const ledger = this._findOrCreate(peerId)
180179

181180
if (msg.empty) {
182-
return setImmediate(cb)
181+
return process.nextTick(cb)
183182
}
184183

185184
// If the message was a full wantlist clear the current one
@@ -190,7 +189,7 @@ class DecisionEngine {
190189
this._processBlocks(msg.blocks, ledger)
191190

192191
if (msg.wantlist.size === 0) {
193-
return setImmediate(cb)
192+
return process.nextTick(cb)
194193
}
195194

196195
let cancels = []
@@ -294,12 +293,12 @@ class DecisionEngine {
294293

295294
start (callback) {
296295
this._running = true
297-
setImmediate(() => callback())
296+
process.nextTick(() => callback())
298297
}
299298

300299
stop (callback) {
301300
this._running = false
302-
setImmediate(() => callback())
301+
process.nextTick(() => callback())
303302
}
304303
}
305304

src/index.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const waterfall = require('async/waterfall')
44
const reject = require('async/reject')
55
const each = require('async/each')
66
const series = require('async/series')
7-
const setImmediate = require('async/setImmediate')
87
const map = require('async/map')
98

109
const WantManager = require('./want-manager')
@@ -109,7 +108,7 @@ class Bitswap {
109108
(has, cb) => {
110109
this._updateReceiveCounters(peerId.toB58String(), block, has)
111110
if (has) {
112-
return setImmediate(cb)
111+
return process.nextTick(cb)
113112
}
114113

115114
this._putBlock(block, cb)
@@ -147,7 +146,7 @@ class Bitswap {
147146
_putBlock (block, callback) {
148147
this.blockstore.put(block, (err) => {
149148
if (err) {
150-
return setImmediate(() => callback(err))
149+
return process.nextTick(() => callback(err))
151150
}
152151

153152
this.notifications.hasBlock(block)
@@ -311,7 +310,7 @@ class Bitswap {
311310
(cb) => this.blockstore.has(block.cid, cb),
312311
(has, cb) => {
313312
if (has) {
314-
return setImmediate(cb)
313+
return process.nextTick(cb)
315314
}
316315

317316
this._putBlock(block, cb)
@@ -334,7 +333,7 @@ class Bitswap {
334333
}, cb),
335334
(newBlocks, cb) => this.blockstore.putMany(newBlocks, (err) => {
336335
if (err) {
337-
return setImmediate(() => cb(err))
336+
return process.nextTick(() => cb(err))
338337
}
339338

340339
newBlocks.forEach((block) => {
@@ -346,7 +345,7 @@ class Bitswap {
346345
}
347346
})
348347
})
349-
setImmediate(cb)
348+
process.nextTick(cb)
350349
})
351350
], callback)
352351
}

src/network.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const lp = require('pull-length-prefixed')
44
const pull = require('pull-stream')
55
const waterfall = require('async/waterfall')
66
const each = require('async/each')
7-
const setImmediate = require('async/setImmediate')
87

98
const Message = require('./types/message')
109
const CONSTANTS = require('./constants')
@@ -44,7 +43,7 @@ class Network {
4443
.filter((peer) => peer.isConnected())
4544
.forEach((peer) => this._onPeerConnect((peer)))
4645

47-
setImmediate(() => callback())
46+
process.nextTick(() => callback())
4847
}
4948

5049
stop (callback) {
@@ -56,7 +55,7 @@ class Network {
5655
this.libp2p.removeListener('peer:connect', this._onPeerConnect)
5756
this.libp2p.removeListener('peer:disconnect', this._onPeerDisconnect)
5857

59-
setImmediate(() => callback())
58+
process.nextTick(() => callback())
6059
}
6160

6261
// Handles both types of bitswap messgages

src/types/message/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ BitswapMessage.deserialize = (raw, callback) => {
139139
try {
140140
decoded = pbm.Message.decode(raw)
141141
} catch (err) {
142-
return setImmediate(() => callback(err))
142+
return process.nextTick(() => callback(err))
143143
}
144144

145145
const isFull = (decoded.wantlist && decoded.wantlist.full) || false
@@ -187,7 +187,7 @@ BitswapMessage.deserialize = (raw, callback) => {
187187
if (decoded.payload.length > 0) {
188188
return each(decoded.payload, (p, cb) => {
189189
if (!p.prefix || !p.data) {
190-
return setImmediate(cb)
190+
return process.nextTick(cb)
191191
}
192192
const values = vd(p.prefix)
193193
const cidVersion = values[0]

src/want-manager/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict'
22

3-
const setImmediate = require('async/setImmediate')
4-
53
const Message = require('../types/message')
64
const Wantlist = require('../types/wantlist')
75
const CONSTANTS = require('../constants')
@@ -125,13 +123,13 @@ module.exports = class WantManager {
125123
this.peers.forEach((p) => p.addMessage(fullwantlist))
126124
}, 60 * 1000)
127125

128-
setImmediate(() => callback())
126+
process.nextTick(() => callback())
129127
}
130128

131129
stop (callback) {
132130
this.peers.forEach((mq) => this.disconnected(mq.peerId))
133131

134132
clearInterval(this.timer)
135-
setImmediate(() => callback())
133+
process.nextTick(() => callback())
136134
}
137135
}

0 commit comments

Comments
 (0)