From 91eed23e9b4f852217883747c27aa25978428f20 Mon Sep 17 00:00:00 2001 From: nuevoalex Date: Mon, 26 Feb 2018 23:05:48 -0800 Subject: [PATCH] Add linting to CI explicitly and fix current lint problem --- package.json | 2 +- source/contracts/reporting/Universe.sol | 2 +- source/support/Dockerfile | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 883d62db0..53df5750f 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "test": "test" }, "scripts": { - "lint": "npx solium --dir . --reporter=gcc", + "lint": "npx solium --dir source --reporter=gcc", "build:source": "npx tsc", "build:contracts": "node output/deployment/compileContracts.js", "build:interfaces": "node output/tools/generateContractInterfaces.js", diff --git a/source/contracts/reporting/Universe.sol b/source/contracts/reporting/Universe.sol index 0a62bb6b5..91c692c9b 100644 --- a/source/contracts/reporting/Universe.sol +++ b/source/contracts/reporting/Universe.sol @@ -376,7 +376,7 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv .mul(_previousValue .mul(_badMarkets) .div(_totalMarkets) - .sub(_previousValue / _targetDivisor)); + .sub(_previousValue / _targetDivisor)); _newValue = _newValue / (_targetDivisor - 1); _newValue = _newValue.add(_previousValue); } diff --git a/source/support/Dockerfile b/source/support/Dockerfile index 1c2b3076c..58505323b 100644 --- a/source/support/Dockerfile +++ b/source/support/Dockerfile @@ -22,6 +22,7 @@ RUN pip install --upgrade pip setuptools \ # Install basics of the application COPY .soliumrc.json /app/.soliumrc.json +COPY .soliumignore /app/.soliumignore COPY tsconfig.json /app/tsconfig.json COPY typings/ /app/typings/ COPY source/contracts/ /app/source/contracts/ @@ -34,6 +35,9 @@ COPY package.json /app/package.json RUN npm install +# Lint +RUN npm run lint + # Build first chunk RUN npm run build:source RUN npm run build:contracts