mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-22 09:57:02 +01:00
Upgrade ganache - continued (#13354)
* remove ganache-core * use ganache v7 * convert to hex * lint
This commit is contained in:
parent
c58cc631c7
commit
e2a8886a05
@ -46,8 +46,11 @@ describe('Transaction Controller', function () {
|
|||||||
// by default, all accounts are external accounts (not contracts)
|
// by default, all accounts are external accounts (not contracts)
|
||||||
eth_getCode: '0x',
|
eth_getCode: '0x',
|
||||||
};
|
};
|
||||||
provider = createTestProviderTools({ scaffold: providerResultStub })
|
provider = createTestProviderTools({
|
||||||
.provider;
|
scaffold: providerResultStub,
|
||||||
|
networkId: currentNetworkId,
|
||||||
|
chainId: currentNetworkId,
|
||||||
|
}).provider;
|
||||||
|
|
||||||
fromAccount = getTestAccounts()[0];
|
fromAccount = getTestAccounts()[0];
|
||||||
const blockTrackerStub = new EventEmitter();
|
const blockTrackerStub = new EventEmitter();
|
||||||
|
@ -291,7 +291,6 @@
|
|||||||
"fast-glob": "^3.2.2",
|
"fast-glob": "^3.2.2",
|
||||||
"fs-extra": "^8.1.0",
|
"fs-extra": "^8.1.0",
|
||||||
"ganache": "^v7.0.0-rc.0",
|
"ganache": "^v7.0.0-rc.0",
|
||||||
"ganache-core": "^2.13.1",
|
|
||||||
"geckodriver": "^1.21.0",
|
"geckodriver": "^1.21.0",
|
||||||
"globby": "^11.0.4",
|
"globby": "^11.0.4",
|
||||||
"gulp": "^4.0.2",
|
"gulp": "^4.0.2",
|
||||||
|
@ -8,7 +8,7 @@ describe('Incremental Security', function () {
|
|||||||
{
|
{
|
||||||
secretKey:
|
secretKey:
|
||||||
'0x250F458997A364988956409A164BA4E16F0F99F916ACDD73ADCD3A1DE30CF8D1',
|
'0x250F458997A364988956409A164BA4E16F0F99F916ACDD73ADCD3A1DE30CF8D1',
|
||||||
balance: '0x0',
|
balance: convertToHexValue(0),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
secretKey:
|
secretKey:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { JsonRpcEngine, createScaffoldMiddleware } from 'json-rpc-engine';
|
import { JsonRpcEngine, createScaffoldMiddleware } from 'json-rpc-engine';
|
||||||
import { providerAsMiddleware } from 'eth-json-rpc-middleware';
|
import { providerAsMiddleware } from 'eth-json-rpc-middleware';
|
||||||
import GanacheCore from 'ganache-core';
|
import Ganache from 'ganache';
|
||||||
|
|
||||||
export function getTestSeed() {
|
export function getTestSeed() {
|
||||||
return 'people carpet cluster attract ankle motor ozone mass dove original primary mask';
|
return 'people carpet cluster attract ankle motor ozone mass dove original primary mask';
|
||||||
@ -48,11 +48,11 @@ export function createTestProviderTools(opts = {}) {
|
|||||||
// handle block tracker methods
|
// handle block tracker methods
|
||||||
engine.push(
|
engine.push(
|
||||||
providerAsMiddleware(
|
providerAsMiddleware(
|
||||||
GanacheCore.provider({
|
Ganache.provider({
|
||||||
mnemonic: getTestSeed(),
|
mnemonic: getTestSeed(),
|
||||||
network_id: opts.networkId,
|
network_id: opts.networkId,
|
||||||
_chainId: opts.chainId,
|
chain: { chainId: opts.chainId },
|
||||||
_chainIdRpc: opts.chainId,
|
hardfork: 'muirGlacier',
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user