diff options
| author | Jacob Evans <dekz@dekz.net> | 2018-07-04 18:07:05 +0800 |
|---|---|---|
| committer | Jacob Evans <jacob@dekz.net> | 2018-07-04 18:29:54 +0800 |
| commit | 5915f8430c252a341cac9c5ef645836efd4d7e92 (patch) | |
| tree | 2d973f3b39d19247855a6320cc48858f0011df40 /packages/subproviders | |
| parent | 9e0f06d06055022fff80bbf7a8b6444f72f898ec (diff) | |
| parent | aeea3817a48473aec0eb378b0ad6cbe7e7877044 (diff) | |
| download | dexon-0x-contracts-5915f8430c252a341cac9c5ef645836efd4d7e92.tar dexon-0x-contracts-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.gz dexon-0x-contracts-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.bz2 dexon-0x-contracts-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.lz dexon-0x-contracts-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.xz dexon-0x-contracts-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.zst dexon-0x-contracts-5915f8430c252a341cac9c5ef645836efd4d7e92.zip | |
Merge branch 'v2-prototype' into eth-lightwallet-subprovider-final
Diffstat (limited to 'packages/subproviders')
| -rw-r--r-- | packages/subproviders/package.json | 5 | ||||
| -rw-r--r-- | packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 651d0e708..076129636 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -56,12 +56,11 @@ "lodash": "^4.17.4", "semaphore-async-await": "^1.5.1", "web3": "^0.20.0", - "web3-provider-engine": "^14.0.4" + "web3-provider-engine": "14.0.6" }, "devDependencies": { "@0xproject/monorepo-scripts": "^0.2.1", "@0xproject/tslint-config": "^0.4.20", - "@0xproject/typescript-typings": "^0.4.2", "@0xproject/utils": "^0.7.1", "@types/bip39": "^2.4.0", "@types/bn.js": "^4.11.0", @@ -70,6 +69,7 @@ "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", + "@types/sinon": "^2.2.2", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "copyfiles": "^1.2.0", @@ -79,6 +79,7 @@ "npm-run-all": "^4.1.2", "nyc": "^11.0.1", "shx": "^0.2.2", + "sinon": "^4.0.0", "tslint": "5.8.0", "typedoc": "0xProject/typedoc", "typescript": "2.7.1", diff --git a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts index 593027849..810fb8f45 100644 --- a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts +++ b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts @@ -1,6 +1,7 @@ import { DoneCallback } from '@0xproject/types'; import * as chai from 'chai'; import { JSONRPCResponsePayload } from 'ethereum-types'; +import * as Sinon from 'sinon'; import Web3ProviderEngine = require('web3-provider-engine'); import RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); @@ -41,6 +42,9 @@ describe('RedundantSubprovider', () => { const nonExistentSubprovider = new RpcSubprovider({ rpcUrl: 'http://does-not-exist:3000', }); + const handleRequestStub = Sinon.stub(nonExistentSubprovider, 'handleRequest').throws( + new Error('REQUEST_FAILED'), + ); const subproviders = [nonExistentSubprovider as Subprovider, ganacheSubprovider]; const redundantSubprovider = new RedundantSubprovider(subproviders); provider.addProvider(redundantSubprovider); @@ -55,6 +59,7 @@ describe('RedundantSubprovider', () => { const callback = reportCallbackErrors(done)((err: Error, response: JSONRPCResponsePayload) => { expect(err).to.be.a('null'); expect(response.result.length).to.be.equal(DEFAULT_NUM_ACCOUNTS); + handleRequestStub.restore(); done(); }); provider.sendAsync(payload, callback); |