From 4887d1d42fe88db88d40a4ed2531277d495147ec Mon Sep 17 00:00:00 2001 From: "F. Eugene Aumson" Date: Sun, 1 Jul 2018 20:22:57 -0400 Subject: in subproviders, cite typescript-typings only once `yarn build` was giving the following warning: warning package.json: "dependencies" has dependency "@0xproject/typescript-typings" with range "^0.4.1" that collides with a dependency in "devDependencies" of the same name with version "^0.4.2" --- packages/subproviders/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages/subproviders/package.json') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 31b6ffed6..013abb155 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -42,7 +42,7 @@ "dependencies": { "@0xproject/assert": "^0.2.12", "@0xproject/types": "^0.8.1", - "@0xproject/typescript-typings": "^0.4.1", + "@0xproject/typescript-typings": "^0.4.2", "@0xproject/utils": "^0.7.1", "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "^4.3.0", @@ -61,7 +61,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", -- cgit v1.2.3 From 4c99ac0ca2e758faf4f9fa8f9703cea357eb15aa Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 3 Jul 2018 15:59:30 +0200 Subject: Update web3-provider-engine --- packages/subproviders/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/subproviders/package.json') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index d15f80163..43508aa0f 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -56,7 +56,7 @@ "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", -- cgit v1.2.3 From 671f29774b9a46420fdee33e3ecbffc7fa6f4c1a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 3 Jul 2018 16:56:49 +0200 Subject: Update web3-provider-engine version w/o caret --- packages/subproviders/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/subproviders/package.json') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 43508aa0f..23037df09 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -56,7 +56,7 @@ "lodash": "^4.17.4", "semaphore-async-await": "^1.5.1", "web3": "^0.20.0", - "web3-provider-engine": "^14.0.6" + "web3-provider-engine": "14.0.6" }, "devDependencies": { "@0xproject/monorepo-scripts": "^0.2.1", -- cgit v1.2.3 From 5e8ef070e2255a1360753e81045cb42572e9c877 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 3 Jul 2018 18:26:12 +0200 Subject: Fix alignment --- packages/subproviders/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/subproviders/package.json') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 23037df09..a3ff31f53 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -56,7 +56,7 @@ "lodash": "^4.17.4", "semaphore-async-await": "^1.5.1", "web3": "^0.20.0", - "web3-provider-engine": "14.0.6" + "web3-provider-engine": "14.0.6" }, "devDependencies": { "@0xproject/monorepo-scripts": "^0.2.1", -- cgit v1.2.3 From 4ba108d12f857ae29c5f5d46fec005027609666d Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 4 Jul 2018 00:59:18 +0200 Subject: Use stub in test to avoid difference in setup, how network requests take place --- packages/subproviders/package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/subproviders/package.json') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index a3ff31f53..8634341ae 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -69,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", @@ -78,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", -- cgit v1.2.3