From 3cbf2b7e3e8608ec5f79ffd64cc15bc633ef2466 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 17 Jan 2018 19:44:11 -0800 Subject: test - remove createEthJsQueryStub --- test/stub/provider.js | 15 +-------------- test/unit/tx-controller-test.js | 6 ++---- 2 files changed, 3 insertions(+), 18 deletions(-) (limited to 'test') diff --git a/test/stub/provider.js b/test/stub/provider.js index 85e1da707..9f1405c9e 100644 --- a/test/stub/provider.js +++ b/test/stub/provider.js @@ -5,7 +5,6 @@ module.exports = { createEngineForTestData, providerFromEngine, scaffoldMiddleware, - createEthJsQueryStub, createStubedProvider, } @@ -19,20 +18,8 @@ function providerFromEngine (engine) { return provider } -function createEthJsQueryStub (stubProvider) { - return new Proxy({}, { - get: (obj, method) => { - return (...params) => { - return new Promise((resolve, reject) => { - stubProvider.sendAsync({ method: `eth_${method}`, params }, (err, ress) => resolve(ress.result)) - }) - } - }, - }) -} - function createStubedProvider (resultStub) { const engine = createEngineForTestData() engine.push(scaffoldMiddleware(resultStub)) return providerFromEngine(engine) -} \ No newline at end of file +} diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js index 36f3e1c68..882a15334 100644 --- a/test/unit/tx-controller-test.js +++ b/test/unit/tx-controller-test.js @@ -1,11 +1,12 @@ const assert = require('assert') const ethUtil = require('ethereumjs-util') const EthTx = require('ethereumjs-tx') +const EthjsQuery = require('ethjs-query') const ObservableStore = require('obs-store') const sinon = require('sinon') const TransactionController = require('../../app/scripts/controllers/transactions') const TxGasUtils = require('../../app/scripts/lib/tx-gas-utils') -const { createStubedProvider, createEthJsQueryStub } = require('../stub/provider') +const { createStubedProvider } = require('../stub/provider') const noop = () => true const currentNetworkId = 42 @@ -30,10 +31,7 @@ describe('Transaction Controller', function () { resolve() }), }) - txController.query = createEthJsQueryStub(provider) - txController.txGasUtil.query = createEthJsQueryStub(provider) txController.nonceTracker.getNonceLock = () => Promise.resolve({ nextNonce: 0, releaseLock: noop }) - txController.txProviderUtils = new TxGasUtils(txController.provider) }) describe('#getState', function () { -- cgit v1.2.3