Skip to content
This repository has been archived by the owner on Apr 22, 2024. It is now read-only.

chore: updating ganache dependency #397

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions package.json
Expand Up @@ -23,9 +23,6 @@
"util"
],
"license": "MIT",
"resolutions": {
"ganache-core/**/elliptic": "^6.5.2"
},
"dependencies": {
"@ethereumjs/tx": "^3.3.0",
"async": "^2.5.0",
Expand Down Expand Up @@ -58,7 +55,7 @@
"browserify": "^16.5.0",
"eslint": "^6.2.0",
"ethjs": "^0.3.6",
"ganache-core": "^2.7.0",
"ganache": "^7.0.0-rc.0",
"tape": "^4.4.0"
},
"browser": {
Expand Down
4 changes: 2 additions & 2 deletions test/cache.js
@@ -1,6 +1,6 @@
const test = require('tape')
const series = require('async/series')
const createGanacheProvider = require('ganache-core').provider
const createGanacheProvider = require('ganache').provider
const ProviderEngine = require('../index.js')
const FixtureProvider = require('../subproviders/fixture.js')
const CacheProvider = require('../subproviders/cache.js')
Expand Down Expand Up @@ -214,7 +214,7 @@ function cacheTest(label, payloads, shouldHitCacheOnSecondRequest){

series([
// increment one block from #0 to #1
(next) => ganacheProvider.sendAsync({ id: 1, method: 'evm_mine', params: [] }, next),
(next) => ganacheProvider.request({ id: 1, method: 'evm_mine', params: [] }).then(val => next(null, val), next),
// run polling until first block
(next) => {
engine.start()
Expand Down
6 changes: 3 additions & 3 deletions test/inflight-cache.js
@@ -1,7 +1,7 @@
const test = require('tape')
const asyncParallel = require('async/parallel')
const asyncSeries = require('async/series')
const createGanacheProvider = require('ganache-core').provider
const createGanacheProvider = require('ganache').provider
const ProviderEngine = require('../index.js')
const FixtureProvider = require('../subproviders/fixture.js')
const InflightCacheProvider = require('../subproviders/inflight-cache.js')
Expand Down Expand Up @@ -59,9 +59,9 @@ function inflightTest(label, payloads, shouldHitCacheOnSecondRequest){
engine.addProvider(dataProvider)
engine.addProvider(blockProvider)

asyncSeries([
asyncParallel([
// increment one block from #0 to #1
(next) => ganacheProvider.sendAsync({ id: 1, method: 'evm_mine', params: [] }, next),
(next) => ganacheProvider.request({ id: 1, method: 'evm_mine', params: [] }).then(val => next(null, val), next),
// run polling until first block
(next) => {
engine.start()
Expand Down
2 changes: 1 addition & 1 deletion test/util/ganache.js
@@ -1,4 +1,4 @@
const { provider } = require('ganache-core')
const { provider } = require('ganache')
const ProviderSubprovider = require('../../subproviders/provider')


Expand Down