From 0ca5dae3060e0f299116b85e5899a0fa9b612ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Guti=C3=A9rrez?= Date: Fri, 14 Jun 2019 12:07:35 +0200 Subject: [PATCH] Improve version output. --- package-lock.json | 19 ++++++++--------- package.json | 1 + src/aquarius/Aquarius.ts | 2 +- src/brizo/Brizo.ts | 2 +- src/keeper/Keeper.ts | 6 +++--- src/ocean/OceanVersions.ts | 42 +++++++++++++++++++------------------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61b309a..c21f54d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2653,8 +2653,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -2675,14 +2674,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" @@ -2702,8 +2699,7 @@ "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", @@ -2851,7 +2847,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2963,8 +2958,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5333,6 +5327,11 @@ "pinkie": "^2.0.0" } }, + "pjson": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/pjson/-/pjson-1.0.9.tgz", + "integrity": "sha512-4hRJH3YzkUpOlShRzhyxAmThSNnAaIlWZCAb27hd0pVUAXNUAHAO7XZbsPPvsCYwBFEScTmCCL6DGE8NyZ8BdQ==" + }, "pkg-dir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", diff --git a/package.json b/package.json index 263e8bc..4288201 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "bignumber.js": "^8.1.1", "deprecated-decorator": "^0.1.6", "node-fetch": "^2.6.0", + "pjson": "^1.0.9", "save-file": "^2.3.1", "uuid": "^3.3.2", "web3": "1.0.0-beta.37", diff --git a/src/aquarius/Aquarius.ts b/src/aquarius/Aquarius.ts index 39609c6..3c1f614 100644 --- a/src/aquarius/Aquarius.ts +++ b/src/aquarius/Aquarius.ts @@ -34,7 +34,7 @@ export class Aquarius extends Instantiable { this.setInstanceConfig(config) } - async getVersionInfo() { + public async getVersionInfo() { return await (await this.ocean.utils.fetch.get(this.url)).json() } diff --git a/src/brizo/Brizo.ts b/src/brizo/Brizo.ts index 68ab3db..f890e75 100644 --- a/src/brizo/Brizo.ts +++ b/src/brizo/Brizo.ts @@ -22,7 +22,7 @@ export class Brizo extends Instantiable { this.setInstanceConfig(config) } - async getVersionInfo() { + public async getVersionInfo() { return await (await this.ocean.utils.fetch.get(this.url)).json() } diff --git a/src/keeper/Keeper.ts b/src/keeper/Keeper.ts index 9fb292f..aa77ace 100644 --- a/src/keeper/Keeper.ts +++ b/src/keeper/Keeper.ts @@ -84,8 +84,6 @@ export class Keeper extends Instantiable { return keeper } - private instances: {[contractRef: string]: ContractBase & any} - /** * Is connected to the correct network or not. * @type {boolean} @@ -151,6 +149,8 @@ export class Keeper extends Instantiable { eventHandler: EventHandler, } + private instances: {[contractRef: string]: ContractBase & any} + /** * Returns a condition by address. * @param {string} address Address of deployed condition. @@ -212,7 +212,7 @@ export class Keeper extends Instantiable { }) } - getAllInstances() { + public getAllInstances() { return this.instances } } diff --git a/src/ocean/OceanVersions.ts b/src/ocean/OceanVersions.ts index 6dba60c..8526b36 100644 --- a/src/ocean/OceanVersions.ts +++ b/src/ocean/OceanVersions.ts @@ -1,13 +1,13 @@ import * as keeperPackageJson from "@oceanprotocol/keeper-contracts/package.json" +import * as packageJson from "pjson" import { Instantiable, InstantiableConfig } from "../Instantiable.abstract" -import * as packageJson from "../../package.json" export enum OceanPlatformTechStatus { - Loading = 'Loading', - Unknown = 'Unknown', - Stopped = 'Stopped', - Working = 'Working', + Loading = "Loading", + Unknown = "Unknown", + Stopped = "Stopped", + Working = "Working", } interface OceanPlatformTech { @@ -29,7 +29,7 @@ export interface OceanPlatformVersions extends Array ({ ...acc, [contractName]: address, - }), {}) + }), {}), } // Brizo try { - const {contracts, 'keeper-version': keeperVersion, network, software: name, version} = + const {contracts, "keeper-version": keeperVersion, network, software: name, version} = await this.ocean.brizo.getVersionInfo() versions.brizo = { name, @@ -76,11 +76,11 @@ export class OceanVersions extends Instantiable { version, contracts, network, - keeperVersion, + keeperVersion: keeperVersion.replace(/^v/, ""), } } catch { versions.brizo = { - name: 'Brizo', + name: "Brizo", status: OceanPlatformTechStatus.Stopped, } } @@ -95,7 +95,7 @@ export class OceanVersions extends Instantiable { } } catch { versions.aquarius = { - name: 'Aquarius', + name: "Aquarius", status: OceanPlatformTechStatus.Stopped, } } @@ -106,21 +106,21 @@ export class OceanVersions extends Instantiable { const networks = techs .map(({network}) => network) - .filter(_ => !!_) + .filter((_) => !!_) .reduce((acc, network) => ({...acc, [network]: true}), {}) let contractStatus = true - const contracts = techs + const contractList = techs .map(({contracts}) => contracts) - .filter(_ => !!_) - Array.from(contracts.map(Object.keys)) + .filter((_) => !!_) + Array.from(contractList.map(Object.keys)) .reduce((acc, _) => [...acc, ..._], []) .filter((_, i, list) => list.indexOf(_) === i) - .forEach(name => { + .forEach((name) => { let address - contracts - .map(_ => _[name]) - .forEach(_ => { + contractList + .map((_) => _[name]) + .forEach((_) => { if (!address) { address = _ return @@ -131,7 +131,7 @@ export class OceanVersions extends Instantiable { }) }) - versions.status = { + versions.status = { ok: !techs.find(({status}) => status !== OceanPlatformTechStatus.Working), network: Object.keys(networks).length === 1, contracts: contractStatus,