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

Commit 743259d

Browse files
eggplantzzzeggplantzzz
committed
fix some tests to deal with wonky type issues
1 parent 95c3297 commit 743259d

File tree

1 file changed

+37
-36
lines changed

1 file changed

+37
-36
lines changed

‎packages/hdwallet-provider/test/provider.test.ts‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import * as EthUtil from "ethereumjs-util";
44
import Web3 from "web3";
55
import HDWalletProvider from "..";
66
import { describe, it, before, after, afterEach } from "mocha";
7+
import type { provider } from "web3-core";
78

89
describe("HD Wallet Provider", function () {
910
const web3 = new Web3();
1011
let ganacheProvider: any;
11-
let provider: HDWalletProvider;
12+
let hdWalletProvider: HDWalletProvider;
1213

1314
before(() => {
1415
ganacheProvider = Ganache.provider({
@@ -27,8 +28,8 @@ describe("HD Wallet Provider", function () {
2728

2829
afterEach(() => {
2930
web3.setProvider(null);
30-
if (provider) {
31-
provider.engine.stop();
31+
if (hdWalletProvider) {
32+
hdWalletProvider.engine.stop();
3233
}
3334
});
3435

@@ -49,18 +50,18 @@ describe("HD Wallet Provider", function () {
4950

5051
const mnemonic =
5152
"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat";
52-
provider = new HDWalletProvider(mnemonic, ganacheProvider);
53+
hdWalletProvider = new HDWalletProvider(mnemonic, ganacheProvider);
5354

54-
assert.deepEqual(provider.getAddresses(), truffleDevAccounts);
55-
web3.setProvider(provider);
55+
assert.deepEqual(hdWalletProvider.getAddresses(), truffleDevAccounts);
56+
web3.setProvider(hdWalletProvider as provider);
5657

5758
const number = await web3.eth.getBlockNumber();
5859
assert(number === 0);
5960
});
6061

6162
it("throws on invalid mnemonic", () => {
6263
try {
63-
provider = new HDWalletProvider(
64+
hdWalletProvider = new HDWalletProvider(
6465
"takoyaki is delicious",
6566
"http://localhost:8545"
6667
);
@@ -83,10 +84,10 @@ describe("HD Wallet Provider", function () {
8384
"9549f39decea7b7504e15572b2c6a72766df0281cea22bd1a3bc87166b1ca290"
8485
};
8586

86-
provider = new HDWalletProvider(privateKeys, ganacheProvider);
87-
web3.setProvider(provider);
87+
hdWalletProvider = new HDWalletProvider(privateKeys, ganacheProvider);
88+
web3.setProvider(hdWalletProvider as provider);
8889

89-
const addresses = provider.getAddresses();
90+
const addresses = hdWalletProvider.getAddresses();
9091
assert.equal(
9192
addresses.length,
9293
privateKeys.length,
@@ -112,10 +113,10 @@ describe("HD Wallet Provider", function () {
112113
it("provides for a private key", async () => {
113114
const privateKey =
114115
"3f841bf589fdf83a521e55d51afddc34fa65351161eead24f064855fc29c9580"; //random valid private key generated with ethkey
115-
provider = new HDWalletProvider(privateKey, ganacheProvider);
116-
web3.setProvider(provider);
116+
hdWalletProvider = new HDWalletProvider(privateKey, ganacheProvider);
117+
web3.setProvider(hdWalletProvider as provider);
117118

118-
const addresses = provider.getAddresses();
119+
const addresses = hdWalletProvider.getAddresses();
119120
assert.equal(addresses[0], "0xc515db5834d8f110eee96c3036854dbf1d87de2b");
120121
addresses.forEach(address => {
121122
assert(EthUtil.isValidAddress(address), "invalid address");
@@ -143,15 +144,15 @@ describe("HD Wallet Provider", function () {
143144

144145
const mnemonicPhrase =
145146
"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat";
146-
provider = new HDWalletProvider({
147+
hdWalletProvider = new HDWalletProvider({
147148
mnemonic: {
148149
phrase: mnemonicPhrase
149150
},
150151
provider: ganacheProvider
151152
});
152153

153-
assert.deepEqual(provider.getAddresses(), truffleDevAccounts);
154-
web3.setProvider(provider);
154+
assert.deepEqual(hdWalletProvider.getAddresses(), truffleDevAccounts);
155+
web3.setProvider(hdWalletProvider as provider);
155156

156157
const number = await web3.eth.getBlockNumber();
157158
assert(number === 0);
@@ -173,13 +174,13 @@ describe("HD Wallet Provider", function () {
173174

174175
const mnemonicPhrase =
175176
"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat";
176-
provider = new HDWalletProvider({
177+
hdWalletProvider = new HDWalletProvider({
177178
mnemonic: mnemonicPhrase,
178179
provider: ganacheProvider
179180
});
180181

181-
assert.deepEqual(provider.getAddresses(), truffleDevAccounts);
182-
web3.setProvider(provider);
182+
assert.deepEqual(hdWalletProvider.getAddresses(), truffleDevAccounts);
183+
web3.setProvider(hdWalletProvider as provider);
183184

184185
const number = await web3.eth.getBlockNumber();
185186
assert(number === 0);
@@ -200,16 +201,16 @@ describe("HD Wallet Provider", function () {
200201
];
201202
const mnemonicPhrase =
202203
"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat";
203-
provider = new HDWalletProvider({
204+
hdWalletProvider = new HDWalletProvider({
204205
mnemonic: {
205206
phrase: mnemonicPhrase,
206207
password: "yummy"
207208
},
208209
provider: ganacheProvider
209210
});
210211

211-
assert.deepEqual(provider.getAddresses(), accounts);
212-
web3.setProvider(provider);
212+
assert.deepEqual(hdWalletProvider.getAddresses(), accounts);
213+
web3.setProvider(hdWalletProvider as provider);
213214

214215
const number = await web3.eth.getBlockNumber();
215216
assert(number === 0);
@@ -218,20 +219,20 @@ describe("HD Wallet Provider", function () {
218219
it("provides for a default polling interval", () => {
219220
const mnemonicPhrase =
220221
"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat";
221-
provider = new HDWalletProvider({
222+
hdWalletProvider = new HDWalletProvider({
222223
mnemonic: {
223224
phrase: mnemonicPhrase
224225
},
225226
provider: ganacheProvider
226227
// polling interval is unspecified
227228
});
228-
assert.ok(provider.engine, "Web3ProviderEngine instantiated");
229+
assert.ok(hdWalletProvider.engine, "Web3ProviderEngine instantiated");
229230
assert.ok(
230-
(provider.engine as any)._blockTracker,
231+
(hdWalletProvider.engine as any)._blockTracker,
231232
"PollingBlockTracker instantiated"
232233
);
233234
assert.deepEqual(
234-
(provider.engine as any)._blockTracker._pollingInterval,
235+
(hdWalletProvider.engine as any)._blockTracker._pollingInterval,
235236
4000,
236237
"PollingBlockTracker with expected pollingInterval"
237238
);
@@ -240,21 +241,21 @@ describe("HD Wallet Provider", function () {
240241
it("provides for a custom polling interval", () => {
241242
const mnemonicPhrase =
242243
"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat";
243-
provider = new HDWalletProvider({
244+
hdWalletProvider = new HDWalletProvider({
244245
mnemonic: {
245246
phrase: mnemonicPhrase
246247
},
247248
provider: ganacheProvider,
248249
// double the default value, for less chatty JSON-RPC
249250
pollingInterval: 8000
250251
});
251-
assert.ok(provider.engine, "Web3ProviderEngine instantiated");
252+
assert.ok(hdWalletProvider.engine, "Web3ProviderEngine instantiated");
252253
assert.ok(
253-
(provider.engine as any)._blockTracker,
254+
(hdWalletProvider.engine as any)._blockTracker,
254255
"PollingBlockTracker instantiated"
255256
);
256257
assert.deepEqual(
257-
(provider.engine as any)._blockTracker._pollingInterval,
258+
(hdWalletProvider.engine as any)._blockTracker._pollingInterval,
258259
8000,
259260
"PollingBlockTracker with expected pollingInterval"
260261
);
@@ -273,13 +274,13 @@ describe("HD Wallet Provider", function () {
273274
"9549f39decea7b7504e15572b2c6a72766df0281cea22bd1a3bc87166b1ca290"
274275
};
275276

276-
provider = new HDWalletProvider({
277+
hdWalletProvider = new HDWalletProvider({
277278
privateKeys,
278279
provider: ganacheProvider
279280
});
280-
web3.setProvider(provider);
281+
web3.setProvider(hdWalletProvider as provider);
281282

282-
const addresses = provider.getAddresses();
283+
const addresses = hdWalletProvider.getAddresses();
283284
assert.equal(
284285
addresses.length,
285286
privateKeys.length,
@@ -305,7 +306,7 @@ describe("HD Wallet Provider", function () {
305306
describe("instantiation errors", () => {
306307
it("throws on invalid providers", () => {
307308
try {
308-
provider = new HDWalletProvider({
309+
hdWalletProvider = new HDWalletProvider({
309310
mnemonic: {
310311
phrase:
311312
"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat"
@@ -321,7 +322,7 @@ describe("HD Wallet Provider", function () {
321322

322323
it("throws on invalid urls", () => {
323324
try {
324-
provider = new HDWalletProvider({
325+
hdWalletProvider = new HDWalletProvider({
325326
mnemonic: {
326327
phrase:
327328
"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat"
@@ -336,7 +337,7 @@ describe("HD Wallet Provider", function () {
336337

337338
it("throws on invalid mnemonic", () => {
338339
try {
339-
provider = new HDWalletProvider({
340+
hdWalletProvider = new HDWalletProvider({
340341
mnemonic: {
341342
phrase: "I am not a crook"
342343
},

0 commit comments

Comments
 (0)