Skip to content

Commit 1daebd8

Browse files
nodechnodech
committed
Merge PR #895 from 'nodech/change-ownership-resolvers'
2 parents fe336ae + 35a848c commit 1daebd8

File tree

10 files changed

+57
-15
lines changed

10 files changed

+57
-15
lines changed

‎test/auction-reorg-test.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const MemWallet = require('./util/memwallet');
1212
const Network = require('../lib/protocol/network');
1313
const rules = require('../lib/covenants/rules');
1414
const {ownership} = require('../lib/covenants/ownership');
15-
const {CachedStubResolver} = require('./util/stub');
15+
const {CachedStubResolver, STUB_SERVERS} = require('./util/stub');
1616

1717
const network = Network.get('regtest');
1818
const {treeInterval} = network.names;
@@ -75,13 +75,16 @@ describe('Auction Reorg', function() {
7575
this.timeout(20000);
7676

7777
const originalResolver = ownership.Resolver;
78+
const originalServers = ownership.servers;
7879

7980
before(() => {
8081
ownership.Resolver = CachedStubResolver;
82+
ownership.servers = STUB_SERVERS;
8183
});
8284

8385
after(() => {
8486
ownership.Resolver = originalResolver;
87+
ownership.servers = originalServers;
8588
});
8689

8790
describe('Vickrey Auction Reorg', function() {

‎test/auction-test.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const MemWallet = require('./util/memwallet');
99
const Network = require('../lib/protocol/network');
1010
const rules = require('../lib/covenants/rules');
1111
const {ownership} = require('../lib/covenants/ownership');
12-
const {CachedStubResolver} = require('./util/stub');
12+
const {CachedStubResolver, STUB_SERVERS} = require('./util/stub');
1313

1414
const network = Network.get('regtest');
1515
const GNAME_SIZE = 10;
@@ -71,13 +71,16 @@ describe('Auction', function() {
7171
this.timeout(15000);
7272

7373
const originalResolver = ownership.Resolver;
74+
const originalServers = ownership.servers;
7475

7576
before(() => {
7677
ownership.Resolver = CachedStubResolver;
78+
ownership.servers = STUB_SERVERS;
7779
});
7880

7981
after(() => {
8082
ownership.Resolver = originalResolver;
83+
ownership.servers = originalServers;
8184
});
8285

8386
describe('Vickrey Auction', function() {

‎test/chain-checkpoints-test.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const Network = require('../lib/protocol/network');
1313
const rules = require('../lib/covenants/rules');
1414
const {Resource} = require('../lib/dns/resource');
1515
const AirdropProof = require('../lib/primitives/airdropproof');
16-
const {CachedStubResolver} = require('./util/stub');
16+
const {CachedStubResolver, STUB_SERVERS} = require('./util/stub');
1717

1818
const network = Network.get('regtest');
1919

@@ -93,23 +93,26 @@ async function mineBlocks(n, label) {
9393

9494
describe('Checkpoints', function() {
9595
const originalResolver = ownership.Resolver;
96+
const originalServers = ownership.servers;
9697

9798
before(async () => {
9899
ownership.ignore = true;
99100
ownership.Resolver = CachedStubResolver;
101+
ownership.servers = STUB_SERVERS;
100102

101103
await blocks.open();
102104
await chainGenerator.open();
103105
await miner.open();
104106
});
105107

106108
after(async () => {
109+
ownership.ignore = false;
110+
ownership.Resolver = originalResolver;
111+
ownership.servers = originalServers;
112+
107113
await miner.close();
108114
await chainGenerator.close();
109115
await blocks.close();
110-
111-
ownership.ignore = false;
112-
ownership.Resolver = originalResolver;
113116
});
114117

115118
it('should add addrs to miner', async () => {

‎test/chain-icann-lockup-test.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const chainCommon = require('../lib/blockchain/common');
1010
const {BufferMap} = require('buffer-map');
1111
const {thresholdStates} = chainCommon;
1212
const {isReserved, isLockedUp, hashName} = require('../lib/covenants/rules');
13-
const {CachedStubResolver} = require('./util/stub');
13+
const {CachedStubResolver, STUB_SERVERS} = require('./util/stub');
1414

1515
const SOFT_FORK_NAME = 'icannlockup';
1616

@@ -54,13 +54,16 @@ describe('BIP9 - ICANN lockup (integration)', function() {
5454
this.timeout(20000);
5555

5656
const originalResolver = ownership.Resolver;
57+
const originalServers = ownership.servers;
5758

5859
before(() => {
5960
ownership.Resolver = CachedStubResolver;
61+
ownership.servers = STUB_SERVERS;
6062
});
6163

6264
after(() => {
6365
ownership.Resolver = originalResolver;
66+
ownership.servers = originalServers;
6467
});
6568

6669
const CUSTOM = [

‎test/claim-test.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const consensus = require('../lib/protocol/consensus');
99
const {ownership} = require('../lib/covenants/ownership');
1010
const reserved = require('../lib/covenants/reserved');
1111
const {Resource} = require('../lib/dns/resource');
12-
const {CachedStubResolver} = require('./util/stub');
12+
const {CachedStubResolver, STUB_SERVERS} = require('./util/stub');
1313

1414
const network = Network.get('regtest');
1515

@@ -49,18 +49,22 @@ describe('Reserved Name Claims', function() {
4949
this.timeout(10000);
5050

5151
const originalResolver = ownership.Resolver;
52+
const originalServers = ownership.servers;
5253

5354
before(async () => {
55+
ownership.Resolver = CachedStubResolver;
56+
ownership.servers = STUB_SERVERS;
57+
5458
await node.open();
5559

5660
wallet = await wdb.create();
5761
addr = await wallet.receiveAddress();
58-
ownership.Resolver = CachedStubResolver;
5962
});
6063

6164
after(async () => {
62-
await node.close();
6365
ownership.Resolver = originalResolver;
66+
ownership.servers = originalServers;
67+
await node.close();
6468
});
6569

6670
// Reset the ownership flag after every test,

‎test/mempool-invalidation-test.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const rules = require('../lib/covenants/rules');
88
const {states} = require('../lib/covenants/namestate');
99
const {Resource} = require('../lib/dns/resource');
1010
const {forEvent} = require('./util/common');
11-
const {CachedStubResolver} = require('./util/stub');
11+
const {CachedStubResolver, STUB_SERVERS} = require('./util/stub');
1212
const NodeContext = require('./util/node-context');
1313

1414
const network = Network.get('regtest');
@@ -23,13 +23,16 @@ const ACTUAL_RENEWAL_WINDOW = renewalWindow;
2323

2424
describe('Mempool Invalidation', function() {
2525
const originalResolver = ownership.Resolver;
26+
const originalServers = ownership.servers;
2627

2728
before(() => {
2829
ownership.Resolver = CachedStubResolver;
30+
ownership.servers = STUB_SERVERS;
2931
});
3032

3133
after(() => {
3234
ownership.Resolver = originalResolver;
35+
ownership.servers = originalServers;
3336
});
3437

3538
const NAMES = [

‎test/mempool-test.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const rules = require('../lib/covenants/rules');
3333
const NameState = require('../lib/covenants/namestate');
3434
const {states} = NameState;
3535
const {ownership} = require('../lib/covenants/ownership');
36-
const {CachedStubResolver} = require('./util/stub');
36+
const {CachedStubResolver, STUB_SERVERS} = require('./util/stub');
3737

3838
const ONE_HASH = Buffer.alloc(32, 0x00);
3939
ONE_HASH[0] = 0x01;
@@ -77,13 +77,16 @@ describe('Mempool', function() {
7777
this.timeout(5000);
7878

7979
const originalResolver = ownership.Resolver;
80+
const originalServers = ownership.servers;
8081

8182
before(() => {
8283
ownership.Resolver = CachedStubResolver;
84+
ownership.servers = STUB_SERVERS;
8385
});
8486

8587
after(() => {
8688
ownership.Resolver = originalResolver;
89+
ownership.servers = originalServers;
8790
});
8891

8992
describe('Mempool TXs', function() {

‎test/txstart-test.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const Address = require('../lib/primitives/address');
1414
const Script = require('../lib/script/script');
1515
const common = require('../lib/blockchain/common');
1616
const {ownership} = require('../lib/covenants/ownership');
17-
const {CachedStubResolver} = require('./util/stub');
17+
const {CachedStubResolver, STUB_SERVERS} = require('./util/stub');
1818
const VERIFY_NONE = common.flags.VERIFY_NONE;
1919

2020
const node = new FullNode({
@@ -51,21 +51,24 @@ describe('Disable TXs', function() {
5151
let utxo, lastTX;
5252

5353
const originalResolver = ownership.Resolver;
54+
const originalServers = ownership.servers;
5455

5556
before(async () => {
57+
ownership.Resolver = CachedStubResolver;
58+
ownership.servers = STUB_SERVERS;
5659
node.network.txStart = 5;
5760
await node.open();
5861

5962
// Start with one block for the fakeClaim
6063
const block = await node.miner.mineBlock();
6164
assert(await node.chain.add(block));
62-
ownership.Resolver = CachedStubResolver;
6365
});
6466

6567
after(async () => {
66-
await node.close();
6768
node.network.txStart = RESET_TXSTART;
6869
ownership.Resolver = originalResolver;
70+
ownership.servers = originalServers;
71+
await node.close();
6972
});
7073

7174
it('should reject tx from mempool before txStart', async () => {

‎test/util/stub.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,5 @@ class CachedStubResolver extends StubResolver {
8787
}
8888

8989
exports.CachedStubResolver = CachedStubResolver;
90+
91+
exports.STUB_SERVERS = ['1.1.1.1', '1.0.0.1'];

‎test/wallet-test.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ const Wallet = require('../lib/wallet/wallet');
2525
const rules = require('../lib/covenants/rules');
2626
const {forValue} = require('./util/common');
2727
const wutils = require('./util/wallet');
28+
const {ownership} = require('../lib/covenants/ownership');
29+
const {CachedStubResolver, STUB_SERVERS} = require('./util/stub');
2830
const {
2931
dummyInput,
3032
curBlock,
@@ -55,6 +57,19 @@ let watchWallet = null;
5557
describe('Wallet', function() {
5658
this.timeout(5000);
5759

60+
const originalResolver = ownership.Resolver;
61+
const originalServers = ownership.servers;
62+
63+
before(() => {
64+
ownership.Resolver = CachedStubResolver;
65+
ownership.servers = STUB_SERVERS;
66+
});
67+
68+
after(() => {
69+
ownership.Resolver = originalResolver;
70+
ownership.servers = originalServers;
71+
});
72+
5873
it('should open walletdb', async () => {
5974
network.coinbaseMaturity = 1;
6075
await wdb.open();

0 commit comments

Comments
 (0)