Skip to content

Commit df997a4

Browse files
committed
Merge PR #687 from 'nodech/test-worker-size'
2 parents 34a3b00 + 4f59446 commit df997a4

9 files changed

+26
-20
lines changed

test/airdrop-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ const AirdropProof = require('../lib/primitives/airdropproof');
1414
const network = Network.get('regtest');
1515

1616
const workers = new WorkerPool({
17-
enabled: false
17+
enabled: false,
18+
size: 2
1819
});
1920

2021
const AIRDROP_PROOF_FILE = resolve(__dirname, 'data', 'airdrop-proof.base64');

test/auction-reorg-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ const NAME2 = rules.grindName(10, 20, network);
2020

2121
const workers = new WorkerPool({
2222
// Must be disabled for `ownership.ignore`.
23-
enabled: false
23+
enabled: false,
24+
size: 2
2425
});
2526

2627
function createNode() {

test/auction-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ const NAME2 = rules.grindName(10, 20, network);
1616

1717
const workers = new WorkerPool({
1818
// Must be disabled for `ownership.ignore`.
19-
enabled: false
19+
enabled: false,
20+
size: 2
2021
});
2122

2223
function createNode() {

test/chain-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ const opcodes = Script.opcodes;
2121
const network = Network.get('regtest');
2222

2323
const workers = new WorkerPool({
24-
enabled: true
24+
enabled: true,
25+
size: 2
2526
});
2627

2728
const blocks = new BlockStore({

test/invalid-reorg-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ const Network = require('../lib/protocol/network');
1111
const network = Network.get('regtest');
1212

1313
const workers = new WorkerPool({
14-
enabled: true
14+
enabled: true,
15+
size: 2
1516
});
1617

1718
describe('Invalid Reorg', function() {

test/mempool-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ ONE_HASH[0] = 0x01;
3737

3838
const network = Network.get('regtest');
3939
const workers = new WorkerPool({
40-
enabled: true
40+
enabled: true,
41+
size: 2
4142
});
4243

4344
const blocks = new BlockStore({
@@ -474,7 +475,8 @@ describe('Mempool', function() {
474475
describe('Mempool disconnect and reorg handling', function () {
475476
const workers = new WorkerPool({
476477
// Must be disabled for `ownership.ignore`.
477-
enabled: false
478+
enabled: false,
479+
size: 2
478480
});
479481

480482
const blocks = new BlockStore({

test/miner-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ const MemWallet = require('./util/memwallet');
1313
const {BufferSet} = require('buffer-map');
1414

1515
const workers = new WorkerPool({
16-
enabled: true
16+
enabled: true,
17+
size: 2
1718
});
1819

1920
const blocks = new BlockStore({

test/wallet-auction-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ const {
2020
} = network.names;
2121

2222
const workers = new WorkerPool({
23-
enabled: false
23+
enabled: false,
24+
size: 2
2425
});
2526

2627
const blocks = new BlockStore({

test/wallet-test.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ const KEY2 = 'xprv9s21ZrQH143K3mqiSThzPtWAabQ22Pjp3uSNnZ53A5bQ4udp'
3636
+ 'faKekc2m4AChLYH1XDzANhrSdxHYWUeTWjYJwFwWFyHkTMnMeAcW4JyRCZa';
3737

3838
const enabled = true;
39+
const size = 2;
3940
const network = Network.get('main');
40-
const workers = new WorkerPool({ enabled });
41+
const workers = new WorkerPool({ enabled, size });
4142
const wdb = new WalletDB({ network, workers });
4243

4344
let currentWallet = null;
@@ -1854,7 +1855,7 @@ describe('Wallet', function() {
18541855

18551856
describe('Disable TXs', function() {
18561857
const network = Network.get('regtest');
1857-
const workers = new WorkerPool({ enabled });
1858+
const workers = new WorkerPool({ enabled, size });
18581859
const wdb = new WalletDB({ network, workers });
18591860

18601861
before(async () => {
@@ -1916,11 +1917,7 @@ describe('Wallet', function() {
19161917
let wdb = null;
19171918

19181919
beforeEach(async () => {
1919-
workers = new WorkerPool({
1920-
enabled: true,
1921-
size: 2
1922-
});
1923-
1920+
workers = new WorkerPool({ enabled, size });
19241921
wdb = new WalletDB({ workers });
19251922
await workers.open();
19261923
await wdb.open();
@@ -1977,7 +1974,7 @@ describe('Wallet', function() {
19771974

19781975
describe('TXDB locked balance', function() {
19791976
const network = Network.get('regtest');
1980-
const workers = new WorkerPool({ enabled });
1977+
const workers = new WorkerPool({ enabled, size });
19811978
const wdb = new WalletDB({ network, workers });
19821979
// This test executes a complete auction for this name
19831980
const name = 'satoshi';
@@ -2356,7 +2353,7 @@ describe('Wallet', function() {
23562353

23572354
describe('TXDB locked balance after simulated rescan', function() {
23582355
const network = Network.get('regtest');
2359-
const workers = new WorkerPool({ enabled });
2356+
const workers = new WorkerPool({ enabled, size });
23602357
const wdb = new WalletDB({ network, workers });
23612358
const name = 'satoshi';
23622359
const nameHash = rules.hashName(name);
@@ -2760,7 +2757,7 @@ describe('Wallet', function() {
27602757
// that later 'it' blocks depend on.
27612758
let wallet, update;
27622759
const network = Network.get('regtest');
2763-
const workers = new WorkerPool({enabled: false});
2760+
const workers = new WorkerPool({enabled: false, size});
27642761
const wdb = new WalletDB({network, workers});
27652762
// Cloudflare's "custom value" plus the standard "name value".
27662763
// Verifiable with reserved-browser.js and names.json
@@ -2939,7 +2936,7 @@ describe('Wallet', function() {
29392936

29402937
describe('Create auction-related TX in advance', function () {
29412938
const network = Network.get('regtest');
2942-
const workers = new WorkerPool({ enabled });
2939+
const workers = new WorkerPool({ enabled, size });
29432940
const wdb = new WalletDB({ network, workers });
29442941
// This test executes a complete auction for this name
29452942
const name = 'satoshi-in-advance';

0 commit comments

Comments
 (0)