diff --git a/integration/config.ts b/integration/config.ts index cd2e3ef..bb208f0 100644 --- a/integration/config.ts +++ b/integration/config.ts @@ -2,12 +2,22 @@ import * as HDWalletProvider from "truffle-hdwallet-provider" import { Config } from "../src" const configJson: Config = { - "nodeUri": "http://localhost:8545", - "aquariusUri": "http://172.15.0.15:5000", - "brizoUri": "http://localhost:8030", //"https://brizo-ha.dev-ocean.com", - "brizoAddress": "0x00bd138abd70e2f00903268f3db08f2d25677c9e", // "0x413c9ba0a05b8a600899b41b0c62dd661e689354", - "secretStoreUri": "https://secret-store.dev-ocean.com/", - "verbose": false + "nodeUri": "http://localhost:8545", + "aquariusUri": "http://172.15.0.15:5000", + "brizoUri": "http://localhost:8030", + "secretStoreUri": "http://localhost:12001", + "brizoAddress": "0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e", + "verbose": false, +} + +if (process.env.NETWORK_NAME === "nile") { + Object.assign(configJson, { + "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/", + "brizoAddress": "0x413c9ba0a05b8a600899b41b0c62dd661e689354", + }) } if (process.env.SEED_WORDS) { diff --git a/package.json b/package.json index 9938a52..0dc4b22 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "test:watch": "mocha -w --watch-extensions js,ts,json", "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:watch": "mocha -w --watch-extensions js,ts,json --opts integration/mocha.opts", "integration:cover": "nyc --report-dir coverage/integration mocha --opts integration/mocha.opts", "examples": "./src/examples/fire_lazers.sh", @@ -65,7 +66,6 @@ "ethereumjs-util": "^6.0.0", "node-fetch": "^2.3.0", "save-file": "^2.3.1", - "secretstore": "^0.1.0", "uuid": "^3.3.2", "web3": "1.0.0-beta.37", "whatwg-url": "^7.0.0" diff --git a/test/aquarius/Aquarius.test.ts b/test/aquarius/Aquarius.test.ts index 403283c..c35c172 100644 --- a/test/aquarius/Aquarius.test.ts +++ b/test/aquarius/Aquarius.test.ts @@ -1,6 +1,6 @@ import * as assert from "assert" import { Aquarius } from "../../src/aquarius/Aquarius" -import { SearchQuery } from "../../src/aquarius/query/SearchQuery" +import { SearchQuery } from "../../src/aquarius/Aquarius" import { DDO } from "../../src/ddo/DDO" import DID from "../../src/ocean/DID" import WebServiceConnectorProvider from "../../src/utils/WebServiceConnectorProvider" diff --git a/test/ocean/Ocean.test.ts b/test/ocean/Ocean.test.ts index a1b7103..96767f5 100644 --- a/test/ocean/Ocean.test.ts +++ b/test/ocean/Ocean.test.ts @@ -1,7 +1,7 @@ import { assert, spy, use } from "chai" import * as spies from "chai-spies" -import { SearchQuery } from "../../src/aquarius/query/SearchQuery" +import { SearchQuery } from "../../src/aquarius/Aquarius" import Account from "../../src/ocean/Account" import { Ocean } from "../../src/ocean/Ocean" import config from "../config"