From 18037db43d63f4d371c3029eb3f039d174790038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Guti=C3=A9rrez?= Date: Fri, 17 May 2019 10:59:12 +0200 Subject: [PATCH] Add Duero config to execute integration test. --- integration/config.ts | 12 ++++++++++- package-lock.json | 47 +++++++++++++------------------------------ package.json | 3 ++- 3 files changed, 27 insertions(+), 35 deletions(-) diff --git a/integration/config.ts b/integration/config.ts index 463d337..c94a499 100644 --- a/integration/config.ts +++ b/integration/config.ts @@ -15,11 +15,21 @@ if (process.env.NETWORK_NAME === "nile") { nodeUri: "https://nile.dev-ocean.com", aquariusUri: "https://nginx-aquarius.dev-ocean.com", brizoUri: "https://nginx-brizo.dev-ocean.com", - secretStoreUri: "https://secret-store.dev-ocean.com/", + secretStoreUri: "https://secret-store.dev-ocean.com", brizoAddress: "0x413c9ba0a05b8a600899b41b0c62dd661e689354", }) } +if (process.env.NETWORK_NAME === "duero") { + Object.assign(configJson, { + nodeUri: "https://duero.dev-ocean.com", + aquariusUri: "https://aquarius.duero.dev-ocean.com", + brizoUri: "https://brizo.duero.dev-ocean.com", + secretStoreUri: "https://secret-store.duero.dev-ocean.com", + brizoAddress: "0x9d4ed58293f71122ad6a733c1603927a150735d0", + }) +} + if (process.env.SEED_WORDS) { const seedphrase = process.env.SEED_WORDS diff --git a/package-lock.json b/package-lock.json index 9c256c3..9b9e272 100644 --- a/package-lock.json +++ b/package-lock.json @@ -129,9 +129,9 @@ } }, "@oceanprotocol/keeper-contracts": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.9.1.tgz", - "integrity": "sha512-c1LvaH+e1tzow0gZLwSWe19ap+DrZuNmZfxBdwEVEPQXarI0jTXa5qVDoiBow8kBWaqSIUgFAzQOJW8rKdlS1A==" + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.9.7.tgz", + "integrity": "sha512-nOpbSE/BG+tQBfLXZ/EqSOvUPzOuot84vHxjAfEU8K3v4eOnqFJVo+oyB7KlcF87wBJXDmi/Ir9qHY4c0Saipg==" }, "@types/chai": { "version": "4.1.7", @@ -2748,8 +2748,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -2770,14 +2769,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2792,20 +2789,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -2922,8 +2916,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -2935,7 +2928,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2950,7 +2942,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2958,14 +2949,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2984,7 +2973,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -3065,8 +3053,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -3078,7 +3065,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3164,8 +3150,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -3201,7 +3186,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3221,7 +3205,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3265,14 +3248,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/package.json b/package.json index 461fe7b..a33e6e2 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "test:cover": "nyc --report-dir coverage/unit mocha", "integration": "mocha --opts integration/mocha.opts", "integration:nile": "export NETWORK_NAME=nile; mocha --opts integration/mocha.opts", + "integration:duero": "export NETWORK_NAME=duero; mocha --opts integration/mocha.opts", "integration:watch": "mocha -w --watch-extensions js,ts,json --opts integration/mocha.opts", "integration:cover": "nyc --report-dir coverage/integration mocha --opts integration/mocha.opts", "clean": "rm -rf ./dist/ ./doc/ ./.nyc_output", @@ -64,7 +65,7 @@ "web3": "1.0.0-beta.37" }, "dependencies": { - "@oceanprotocol/keeper-contracts": "^0.9.1", + "@oceanprotocol/keeper-contracts": "^0.9.7", "bignumber.js": "^8.1.1", "deprecated-decorator": "^0.1.6", "ethereumjs-util": "^6.1.0",