Skip to content

Commit 1b4e30d

Browse files
seaonaseaona
committed
rename ganache to node
1 parent 9f34bfe commit 1b4e30d

26 files changed

+59
-59
lines changed

‎test/e2e/fixture-builder.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -333,30 +333,30 @@ class FixtureBuilder {
333333
});
334334
}
335335

336-
withNetworkControllerDoubleGanache() {
337-
const ganacheNetworks = mockNetworkStateOld({
336+
withNetworkControllerDoubleNode() {
337+
const secondNode = mockNetworkStateOld({
338338
id: '76e9cd59-d8e2-47e7-b369-9c205ccb602c',
339339
rpcUrl: 'http://localhost:8546',
340340
chainId: '0x53a',
341341
ticker: 'ETH',
342342
nickname: 'Localhost 8546',
343343
});
344-
delete ganacheNetworks.selectedNetworkClientId;
345-
return this.withNetworkController(ganacheNetworks);
344+
delete secondNode.selectedNetworkClientId;
345+
return this.withNetworkController(secondNode);
346346
}
347347

348-
withNetworkControllerTripleGanache() {
349-
this.withNetworkControllerDoubleGanache();
350-
const thirdGanache = mockNetworkStateOld({
348+
withNetworkControllerTripleNode() {
349+
this.withNetworkControllerDoubleNode();
350+
const thirdNode = mockNetworkStateOld({
351351
rpcUrl: 'http://localhost:7777',
352352
chainId: '0x3e8',
353353
ticker: 'ETH',
354354
nickname: 'Localhost 7777',
355355
blockExplorerUrl: undefined,
356356
});
357357

358-
delete thirdGanache.selectedNetworkClientId;
359-
merge(this.fixture.data.NetworkController, thirdGanache);
358+
delete thirdNode.selectedNetworkClientId;
359+
merge(this.fixture.data.NetworkController, thirdNode);
360360
return this;
361361
}
362362

‎test/e2e/flask/multichain-api/wallet_createSession.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ describeBrowserOnly(Browser.CHROME, 'Multichain API', function () {
6565
{
6666
title: this.test?.fullTitle(),
6767
fixtures: new FixtureBuilder()
68-
.withNetworkControllerTripleGanache()
68+
.withNetworkControllerTripleNode()
6969
.withTrezorAccount()
7070
.build(),
7171
...DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,
@@ -179,7 +179,7 @@ describeBrowserOnly(Browser.CHROME, 'Multichain API', function () {
179179
{
180180
title: this.test?.fullTitle(),
181181
fixtures: new FixtureBuilder()
182-
.withNetworkControllerTripleGanache()
182+
.withNetworkControllerTripleNode()
183183
.withPreferencesControllerAdditionalAccountIdentities()
184184
.build(),
185185
...DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,
@@ -267,7 +267,7 @@ describeBrowserOnly(Browser.CHROME, 'Multichain API', function () {
267267
{
268268
title: this.test?.fullTitle(),
269269
fixtures: new FixtureBuilder()
270-
.withNetworkControllerTripleGanache()
270+
.withNetworkControllerTripleNode()
271271
.withPreferencesControllerAdditionalAccountIdentities()
272272
.build(),
273273
...DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,
@@ -355,7 +355,7 @@ describeBrowserOnly(Browser.CHROME, 'Multichain API', function () {
355355
{
356356
title: this.test?.fullTitle(),
357357
fixtures: new FixtureBuilder()
358-
.withNetworkControllerTripleGanache()
358+
.withNetworkControllerTripleNode()
359359
.withPermissionControllerConnectedToMultichainTestDappWithTwoAccounts(
360360
{
361361
scopes: OLD_SCOPES,

‎test/e2e/flask/multichain-api/wallet_invokeMethod.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describeBrowserOnly(Browser.CHROME, 'Multichain API', function () {
3434
{
3535
title: this.test?.fullTitle(),
3636
fixtures: new FixtureBuilder()
37-
.withNetworkControllerTripleGanache()
37+
.withNetworkControllerTripleNode()
3838
.build(),
3939
...DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,
4040
},
@@ -98,7 +98,7 @@ describeBrowserOnly(Browser.CHROME, 'Multichain API', function () {
9898
{
9999
title: this.test?.fullTitle(),
100100
fixtures: new FixtureBuilder()
101-
.withNetworkControllerTripleGanache()
101+
.withNetworkControllerTripleNode()
102102
.build(),
103103
...DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,
104104
},
@@ -164,7 +164,7 @@ describeBrowserOnly(Browser.CHROME, 'Multichain API', function () {
164164
{
165165
title: this.test?.fullTitle(),
166166
fixtures: new FixtureBuilder()
167-
.withNetworkControllerTripleGanache()
167+
.withNetworkControllerTripleNode()
168168
.build(),
169169
...DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,
170170
},

‎test/e2e/flask/multichain-api/wallet_revokeSession.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describeBrowserOnly(
2929
{
3030
title: this.test?.fullTitle(),
3131
fixtures: new FixtureBuilder()
32-
.withNetworkControllerTripleGanache()
32+
.withNetworkControllerTripleNode()
3333
.build(),
3434
...DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,
3535
},
@@ -77,7 +77,7 @@ describeBrowserOnly(
7777
{
7878
title: this.test?.fullTitle(),
7979
fixtures: new FixtureBuilder()
80-
.withNetworkControllerTripleGanache()
80+
.withNetworkControllerTripleNode()
8181
.build(),
8282
...DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,
8383
},

‎test/e2e/flask/multichain-api/wallet_sessionChanged.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describeBrowserOnly(
3434
{
3535
title: this.test?.fullTitle(),
3636
fixtures: new FixtureBuilder()
37-
.withNetworkControllerTripleGanache()
37+
.withNetworkControllerTripleNode()
3838
.build(),
3939
...DEFAULT_MULTICHAIN_TEST_DAPP_FIXTURE_OPTIONS,
4040
},

‎test/e2e/json-rpc/switchEthereumChain.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
1616
{
1717
dapp: true,
1818
fixtures: new FixtureBuilder()
19-
.withNetworkControllerDoubleGanache()
19+
.withNetworkControllerDoubleNode()
2020
.build(),
2121
dappOptions: { numberOfDapps: 2 },
2222
localNodeOptions: [
@@ -91,7 +91,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
9191
{
9292
dapp: true,
9393
fixtures: new FixtureBuilder()
94-
.withNetworkControllerDoubleGanache()
94+
.withNetworkControllerDoubleNode()
9595
.withPreferencesControllerSmartTransactionsOptedOut()
9696
.build(),
9797
dappOptions: { numberOfDapps: 2 },
@@ -220,7 +220,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
220220
{
221221
dapp: true,
222222
fixtures: new FixtureBuilder()
223-
.withNetworkControllerDoubleGanache()
223+
.withNetworkControllerDoubleNode()
224224
.build(),
225225
dappOptions: { numberOfDapps: 2 },
226226
localNodeOptions: [

‎test/e2e/json-rpc/wallet_addEthereumChain.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ describe('Add Ethereum Chain', function () {
103103
{
104104
dapp: true,
105105
fixtures: new FixtureBuilder()
106-
.withNetworkControllerDoubleGanache()
106+
.withNetworkControllerDoubleNode()
107107
.build(),
108108
localNodeOptions: [
109109
{
@@ -166,7 +166,7 @@ describe('Add Ethereum Chain', function () {
166166
{
167167
dapp: true,
168168
fixtures: new FixtureBuilder()
169-
.withNetworkControllerDoubleGanache()
169+
.withNetworkControllerDoubleNode()
170170
.build(),
171171
localNodeOptions: [
172172
{
@@ -281,7 +281,7 @@ describe('Add Ethereum Chain', function () {
281281
{
282282
dapp: true,
283283
fixtures: new FixtureBuilder()
284-
.withNetworkControllerDoubleGanache()
284+
.withNetworkControllerDoubleNode()
285285
.build(),
286286
title: this.test?.fullTitle(),
287287
},
@@ -336,7 +336,7 @@ describe('Add Ethereum Chain', function () {
336336
{
337337
dapp: true,
338338
fixtures: new FixtureBuilder()
339-
.withNetworkControllerDoubleGanache()
339+
.withNetworkControllerDoubleNode()
340340
.withPermissionControllerConnectedToTestDappWithChains([
341341
'0x539',
342342
'0x53a',
@@ -408,7 +408,7 @@ describe('Add Ethereum Chain', function () {
408408
{
409409
dapp: true,
410410
fixtures: new FixtureBuilder()
411-
.withNetworkControllerDoubleGanache()
411+
.withNetworkControllerDoubleNode()
412412
.withPermissionControllerConnectedToTestDappWithChains([
413413
'0x539',
414414
'0x53a',

‎test/e2e/tests/confirmations/alerts/queued-confirmations.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ describe('Queued Confirmations', function () {
3636
{
3737
dapp: true,
3838
fixtures: new FixtureBuilder()
39-
.withNetworkControllerTripleGanache()
39+
.withNetworkControllerTripleNode()
4040
.withSelectedNetworkControllerPerDomain()
4141
.build(),
4242
dappOptions: { numberOfDapps: 2 },
@@ -84,7 +84,7 @@ describe('Queued Confirmations', function () {
8484
{
8585
dapp: true,
8686
fixtures: new FixtureBuilder()
87-
.withNetworkControllerTripleGanache()
87+
.withNetworkControllerTripleNode()
8888

8989
.withSelectedNetworkControllerPerDomain()
9090
.build(),
@@ -140,7 +140,7 @@ describe('Queued Confirmations', function () {
140140
{
141141
dapp: true,
142142
fixtures: new FixtureBuilder()
143-
.withNetworkControllerTripleGanache()
143+
.withNetworkControllerTripleNode()
144144
.withPermissionControllerConnectedToTestDapp()
145145
.withSelectedNetworkControllerPerDomain()
146146
.build(),
@@ -195,7 +195,7 @@ describe('Queued Confirmations', function () {
195195
{
196196
dapp: true,
197197
fixtures: new FixtureBuilder()
198-
.withNetworkControllerTripleGanache()
198+
.withNetworkControllerTripleNode()
199199

200200
.withSelectedNetworkControllerPerDomain()
201201
.withMetaMetricsController({
@@ -284,7 +284,7 @@ describe('Queued Confirmations', function () {
284284
{
285285
dapp: true,
286286
fixtures: new FixtureBuilder()
287-
.withNetworkControllerTripleGanache()
287+
.withNetworkControllerTripleNode()
288288
.withPermissionControllerConnectedToTestDapp()
289289
.withSelectedNetworkControllerPerDomain()
290290
.withMetaMetricsController({

‎test/e2e/tests/connections/review-switch-permission-page.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('Permissions Page when Dapp Switch to an enabled and non permissioned n
1616
{
1717
dapp: true,
1818
fixtures: new FixtureBuilder()
19-
.withNetworkControllerDoubleGanache()
19+
.withNetworkControllerDoubleNode()
2020
.withSelectedNetworkControllerPerDomain()
2121
.build(),
2222
localNodeOptions: [

‎test/e2e/tests/network/custom-rpc-history.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ describe('Custom RPC history', function () {
279279
);
280280
});
281281

282-
it('deletes a custom RPC', async function () {
282+
it.only('deletes a custom RPC', async function () {
283283
const networkState = mockNetworkStateOld(
284284
{
285285
rpcUrl: 'http://127.0.0.1:8545/1',

0 commit comments

Comments
 (0)