Skip to content
This repository was archived by the owner on Jul 3, 2020. It is now read-only.

Commit 9e7368e

Browse files
author
Face Kapow
committed
IIFE function -> IIFE arrow function, fix style issues
1 parent dd1c074 commit 9e7368e

5 files changed

Lines changed: 64 additions & 174 deletions

File tree

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ rules:
3636
-
3737
functions: false
3838
classes: true
39-
no-paran-reassign:
39+
no-param-reassign:
4040
- 2
4141
-
4242
props: false

js/__loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
} else {
217217
/* eslint-disable max-len */
218218
evalScriptFn(
219-
`(function(require,exports,module,__filename,__dirname){${content}})((function(m){return function(path){return m.require(path)}})(global.module),global.module.exports,global.module,global.module.filename,global.module.dirname)`,
219+
`((require,exports,module,__filename,__dirname) => {${content}})(((m) => {return function(path){return m.require(path)}})(global.module),global.module.exports,global.module,global.module.filename,global.module.dirname)`,
220220
displayPath);
221221
/* eslint-enable max-len */
222222
}

js/core/pci/scan.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const sizeof = {
3232
UINT64: 8,
3333
};
3434

35-
const pciAccessorFactory = (function (addressPort, dataPort) {
35+
const pciAccessorFactory = ((addressPort, dataPort) => {
3636
const accessorCache = new Map();
3737

3838
/**
@@ -391,7 +391,7 @@ function locateAcpiDevice(dev) {
391391
/**
392392
* Provides enumeration services for the whole PCI configuration space
393393
*/
394-
const pciSpace = (function (pciAccessorFactoryArg) {
394+
const pciSpace = ((pciAccessorFactoryArg) => {
395395
function checkDevice(bus, slot, func, fn) {
396396
const addr = {
397397
bus,
@@ -443,7 +443,7 @@ const pciSpace = (function (pciAccessorFactoryArg) {
443443
/**
444444
* Service for converting PCI data codes to readable names
445445
*/
446-
const codeNameResolver = (function () {
446+
const codeNameResolver = (() => {
447447
const classCodes = [
448448
'Unclassified',
449449
'Mass Storage Controller',
@@ -699,7 +699,7 @@ class PciDevice {
699699
/**
700700
* Manages PCI devices
701701
*/
702-
const pciManager = (function () {
702+
const pciManager = (() => {
703703
const devicesMap = new Map();
704704

705705
function addressHash(address) {
@@ -882,7 +882,7 @@ pciManager.each((pciDevice) => {
882882
path: '/driver/' + driverData.driver,
883883
data: driverArgs,
884884
env: {}
885-
}).then(function() {}, function(err) {
885+
}).then(() => {}, function(err) {
886886
isolate.log(err);
887887
});
888888
*/

js/driver/virtio/net.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const VirtioDevice = require('./device');
1717
const runtime = require('../../core');
1818
const { MACAddress, Interface } = runtime.net;
1919

20-
const virtioHeader = (function () { // eslint-disable-line wrap-iife
20+
const virtioHeader = (() => {
2121
const OFFSET_FLAGS = 0;
2222
const OFFSET_GSO_TYPE = 1;
2323
// const OFFSET_HDR_LEN = 2;

js/test/unit/net/ip4.js

Lines changed: 56 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,13 @@ function ipFragmentsTest(t, name, length, slices, order, norecv) {
7979
}
8080

8181
test('receive ip4 fragmented non overlapped', (t) => {
82-
const slices = [{
83-
offset: 0,
84-
len: 8,
85-
}, {
86-
offset: 8,
87-
len: 8,
88-
}, {
89-
offset: 16,
90-
len: 16,
91-
}, {
92-
offset: 32,
93-
len: 16,
94-
}, {
95-
offset: 48,
96-
len: 24,
97-
}];
82+
const slices = [
83+
{ offset: 0, len: 8 },
84+
{ offset: 8, len: 8 },
85+
{ offset: 16, len: 16 },
86+
{ offset: 32, len: 16 },
87+
{ offset: 48, len: 24 },
88+
];
9889
ipFragmentsTest(t, 'normal ordered', 64, slices, [0, 1, 2, 3, 4]);
9990
ipFragmentsTest(t, 'reverse ordered', 64, slices, [4, 3, 2, 1, 0]);
10091
ipFragmentsTest(t, 'mixed ordered', 64, slices, [2, 1, 4, 0, 3]);
@@ -104,22 +95,13 @@ test('receive ip4 fragmented non overlapped', (t) => {
10495
});
10596

10697
test('receive ip4 fragmented overlapped fragments', (t) => {
107-
const slices = [{
108-
offset: 0,
109-
len: 8,
110-
}, {
111-
offset: 8,
112-
len: 8,
113-
}, {
114-
offset: 16,
115-
len: 16,
116-
}, {
117-
offset: 24,
118-
len: 16,
119-
}, {
120-
offset: 24,
121-
len: 48,
122-
}];
98+
const slices = [
99+
{ offset: 0, len: 8 },
100+
{ offset: 8, len: 8 },
101+
{ offset: 16, len: 16 },
102+
{ offset: 24, len: 16 },
103+
{ offset: 24, len: 48 },
104+
];
123105
ipFragmentsTest(t, 'fragments left edge overlap', 64, slices, [0, 1, 2, 3, 4]);
124106
ipFragmentsTest(t, 'fragments full and right edge overlap', 64, slices, [4, 3, 2, 1, 0]);
125107
ipFragmentsTest(t, 'mixed ordered (fragment 3 is unnecessary)', 64, slices, [2, 1, 4, 0]);
@@ -131,42 +113,16 @@ test('receive ip4 fragmented overlapped fragments', (t) => {
131113
});
132114

133115
test('receive ip4 fragmented overlapped fragments ladder 1', (t) => {
134-
const slices = [{
135-
offset: 8,
136-
len: 64,
137-
}, // [ ========]
138-
{
139-
offset: 16,
140-
len: 56,
141-
}, // [ =======]
142-
{
143-
offset: 24,
144-
len: 48,
145-
}, // [ ======]
146-
{
147-
offset: 32,
148-
len: 40,
149-
}, // [ =====]
150-
{
151-
offset: 40,
152-
len: 32,
153-
}, // [ ====]
154-
{
155-
offset: 48,
156-
len: 24,
157-
}, // [ ===]
158-
{
159-
offset: 56,
160-
len: 16,
161-
}, // [ ==]
162-
{
163-
offset: 64,
164-
len: 8,
165-
}, // [ =]
166-
{
167-
offset: 0,
168-
len: 8,
169-
}, // [= ] (last piece)
116+
const slices = [
117+
{ offset: 8, len: 64 }, // [ ========]
118+
{ offset: 16, len: 56 }, // [ =======]
119+
{ offset: 24, len: 48 }, // [ ======]
120+
{ offset: 32, len: 40 }, // [ =====]
121+
{ offset: 40, len: 32 }, // [ ====]
122+
{ offset: 48, len: 24 }, // [ ===]
123+
{ offset: 56, len: 16 }, // [ ==]
124+
{ offset: 64, len: 8 }, // [ =]
125+
{ offset: 0, len: 8 }, // [= ] (last piece)
170126
];
171127
ipFragmentsTest(t, 'normal order', 64, slices, [0, 1, 2, 3, 4, 5, 6, 7, 8]);
172128
ipFragmentsTest(t, 'reverse order except last', 64, slices, [7, 6, 5, 4, 3, 2, 1, 0, 8]);
@@ -178,42 +134,16 @@ test('receive ip4 fragmented overlapped fragments ladder 1', (t) => {
178134
});
179135

180136
test('receive ip4 fragmented overlapped fragments ladder 2', (t) => {
181-
const slices = [{
182-
offset: 0,
183-
len: 64,
184-
}, // [======== ]
185-
{
186-
offset: 0,
187-
len: 56,
188-
}, // [======= ]
189-
{
190-
offset: 0,
191-
len: 48,
192-
}, // [====== ]
193-
{
194-
offset: 0,
195-
len: 40,
196-
}, // [===== ]
197-
{
198-
offset: 0,
199-
len: 32,
200-
}, // [==== ]
201-
{
202-
offset: 0,
203-
len: 24,
204-
}, // [=== ]
205-
{
206-
offset: 0,
207-
len: 16,
208-
}, // [== ]
209-
{
210-
offset: 0,
211-
len: 8,
212-
}, // [= ]
213-
{
214-
offset: 64,
215-
len: 8,
216-
}, // [ =] (last piece)
137+
const slices = [
138+
{ offset: 0, len: 64 }, // [======== ]
139+
{ offset: 0, len: 56 }, // [======= ]
140+
{ offset: 0, len: 48 }, // [====== ]
141+
{ offset: 0, len: 40 }, // [===== ]
142+
{ offset: 0, len: 32 }, // [==== ]
143+
{ offset: 0, len: 24 }, // [=== ]
144+
{ offset: 0, len: 16 }, // [== ]
145+
{ offset: 0, len: 8 }, // [= ]
146+
{ offset: 64, len: 8 }, // [ =] (last piece)
217147
];
218148
ipFragmentsTest(t, 'normal order', 64, slices, [0, 1, 2, 3, 4, 5, 6, 7, 8]);
219149
ipFragmentsTest(t, 'reverse order except last', 64, slices, [7, 6, 5, 4, 3, 2, 1, 0, 8]);
@@ -225,30 +155,13 @@ test('receive ip4 fragmented overlapped fragments ladder 2', (t) => {
225155
});
226156

227157
test('receive ip4 fragmented overlapped fragments pyramid', (t) => {
228-
const slices = [{
229-
offset: 8,
230-
len: 56,
231-
}, // [ ======= ]
232-
{
233-
offset: 16,
234-
len: 40,
235-
}, // [ ===== ]
236-
{
237-
offset: 24,
238-
len: 24,
239-
}, // [ === ]
240-
{
241-
offset: 32,
242-
len: 8,
243-
}, // [ = ]
244-
{
245-
offset: 64,
246-
len: 8,
247-
}, // [ =]
248-
{
249-
offset: 0,
250-
len: 8,
251-
}, // [= ]
158+
const slices = [
159+
{ offset: 8, len: 56 }, // [ ======= ]
160+
{ offset: 16, len: 40 }, // [ ===== ]
161+
{ offset: 24, len: 24 }, // [ === ]
162+
{ offset: 32, len: 8 }, // [ = ]
163+
{ offset: 64, len: 8 }, // [ =]
164+
{ offset: 0, len: 8 }, // [= ]
252165
];
253166
ipFragmentsTest(t, 'normal order', 64, slices, [0, 1, 2, 3, 4, 5]);
254167
ipFragmentsTest(t, 'reverse order except last two 1', 64, slices, [3, 2, 1, 0, 4, 5]);
@@ -259,30 +172,13 @@ test('receive ip4 fragmented overlapped fragments pyramid', (t) => {
259172
});
260173

261174
test('receive ip4 fragmented overlapped fragments small chunks', (t) => {
262-
const slices = [{
263-
offset: 0,
264-
len: 8,
265-
}, // [= ]
266-
{
267-
offset: 16,
268-
len: 8,
269-
}, // [ = ]
270-
{
271-
offset: 32,
272-
len: 8,
273-
}, // [ = ]
274-
{
275-
offset: 48,
276-
len: 8,
277-
}, // [ = ]
278-
{
279-
offset: 64,
280-
len: 8,
281-
}, // [ =]
282-
{
283-
offset: 8,
284-
len: 56,
285-
}, // [ ======= ]
175+
const slices = [
176+
{ offset: 0, len: 8 }, // [= ]
177+
{ offset: 16, len: 8 }, // [ = ]
178+
{ offset: 32, len: 8 }, // [ = ]
179+
{ offset: 48, len: 8 }, // [ = ]
180+
{ offset: 64, len: 8 }, // [ =]
181+
{ offset: 8, len: 56 }, // [ ======= ]
286182
];
287183
ipFragmentsTest(t, 'normal order', 64, slices, [0, 1, 2, 3, 4, 5]);
288184
ipFragmentsTest(t, 'reverse order', 64, slices, [5, 4, 3, 2, 1, 0]);
@@ -292,25 +188,19 @@ test('receive ip4 fragmented overlapped fragments small chunks', (t) => {
292188
});
293189

294190
test('receive ip4 fragmented max offset and size', (t) => {
295-
const slices = [{
296-
offset: 0,
297-
len: 65528,
298-
}, {
299-
offset: 65528,
300-
len: 7,
301-
}];
191+
const slices = [
192+
{ offset: 0, len: 65528 },
193+
{ offset: 65528, len: 7 },
194+
];
302195
ipFragmentsTest(t, 'max size', 65535 - 8, slices, [0, 1]);
303196
t.end();
304197
});
305198

306199
test('receive ip4 fragmented too big', (t) => {
307-
const slices = [{
308-
offset: 0,
309-
len: 65528,
310-
}, {
311-
offset: 65528,
312-
len: 7 + 1,
313-
}];
200+
const slices = [
201+
{ offset: 0, len: 65528 },
202+
{ offset: 65528, len: 7 + 1 },
203+
];
314204
ipFragmentsTest(t, 'max-size + 1', (65535 - 8) + 1, slices, [0, 1], true);
315205
t.end();
316206
});

0 commit comments

Comments
 (0)