Skip to content

Commit

Permalink
refactor(lerna): move all packages to packages/ (UMAprotocol#1866)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrice32 authored Aug 20, 2020
1 parent 7529600 commit 8aae10f
Show file tree
Hide file tree
Showing 367 changed files with 17 additions and 42 deletions.
11 changes: 5 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ jobs:
key: protocol-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Run coverage
command: ./ci/coverage.sh ~/protocol/core
command: ./ci/coverage.sh ~/protocol/packages/core
- store_artifacts:
path: core/coverage
path: packages/core/coverage
dapp_build:
docker:
- image: circleci/node:lts
Expand All @@ -136,14 +136,13 @@ jobs:
key: protocol-completed-build-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Apply Deployment Registry
working_directory: ~/protocol/core
command: yarn run apply-registry
command: yarn run load-addresses
- run:
name: Build Voter dApp
working_directory: ~/protocol/voter-dapp
working_directory: ~/protocol/packages/voter-dapp
command: CI=false yarn run build
- store_artifacts:
path: ~/protocol/voter-dapp/build
path: ~/protocol/packages/voter-dapp/build
destination: voter-dapp-build
deploy_to_staging:
docker:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ out.log
.GckmsOverride.js
docs
modules
public
ui
.DS_Store
antora.yml
Expand Down
3 changes: 0 additions & 3 deletions ci/build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#!/usr/bin/env bash
set -e

PROTOCOL_DIR=$(pwd)

cd $PROTOCOL_DIR/core
yarn run truffle compile
2 changes: 1 addition & 1 deletion ci/docgen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# Note: because we've forked the solidity-docgen library, providing the path alias doesn't have an effect. However,
# once external libraries are supported in v2 and we deprecate our fork, this will allow the docgen to find the
# openzeppelin directory. See https://github.com/OpenZeppelin/solidity-docgen/issues/24 for progress on that front.
yarn run solidity-docgen -i ./core/contracts -t documentation -x adoc -e core/contracts/oracle/test,core/contracts/tokenized-derivative/echidna-tests
yarn run solidity-docgen -i ./packages/core/contracts -t documentation -x adoc -e packages/core/contracts/oracle/test
4 changes: 2 additions & 2 deletions ci/run_slither.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sudo chmod -R a+rwx /usr/local/lib/node_modules
run_slither() {
cd $1
mkdir -p node_modules/
cp -r ../node_modules/@openzeppelin ./node_modules/@openzeppelin
cp -r ../../node_modules/@openzeppelin ./node_modules/@openzeppelin

cd $PROTOCOL_DIR

Expand All @@ -17,4 +17,4 @@ run_slither() {
slither --exclude=divide-before-multiply,locked-ether,unused-return,timestamp,naming-convention,pragma,solc-version,external-function,reentrancy-benign,reentrancy-no-eth,arbitrary-send,incorrect-equality,reentrancy-events,assembly --filter-paths="@openzeppelin|WETH9.sol|ReentrancyAttack.sol|ReentrancyMock.sol" $1
}

run_slither $PROTOCOL_DIR/core
run_slither $PROTOCOL_DIR/packages/core
12 changes: 1 addition & 11 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"packages": [
"voter-dapp",
"disputer",
"liquidator",
"monitors",
"reporters",
"core",
"financial-templates-lib",
"common",
"cli"
],
"packages": ["packages/*"],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "independent"
Expand Down
10 changes: 1 addition & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,6 @@
"*.js": "eslint --cache --fix"
},
"workspaces": [
"voter-dapp",
"disputer",
"reporters",
"core",
"liquidator",
"monitors",
"financial-templates-lib",
"common",
"cli"
"packages/*"
]
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 8aae10f

Please sign in to comment.