Skip to content

Commit

Permalink
Merge pull request #22 from certusone/evm
Browse files Browse the repository at this point in the history
Create tools directory for registration scripts
  • Loading branch information
Karl authored May 10, 2022
2 parents 31b0a95 + d3058cc commit 954901d
Show file tree
Hide file tree
Showing 7 changed files with 4,362 additions and 155 deletions.
21 changes: 17 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ clean:
cd ethereum && make clean
cd terra && make clean
cd sdk/js && rm -rf node_modules contracts lib src/icco/__tests__/tilt.json
cd tools && rm -rf node_modules lib
rm -f tilt.json

.PHONY: ethereum
Expand All @@ -28,23 +29,35 @@ terra/artifacts/checksum.txt:

.PHONY: sdk
## Build SDK
sdk: ethereum sdk/js/node_modules
sdk: sdk/js/lib

sdk/js/lib: ethereum sdk/js/node_modules
cd sdk/js && npm run build

sdk/js/node_modules:
cd sdk/js && npm ci

.PHONY: tools
## Build tools (scripts in tools directory)
tools: tools/lib

tools/lib: sdk
cd tools && npm ci && npm run build

.PHONY: tilt-deploy
## Deploy Contracts to Tilt
tilt-deploy: ethereum terra
tilt-deploy: ethereum tools #terra
rm -f tilt.json
@if ! pgrep tilt; then echo "Error: tilt not running. Start it before running tests"; exit 1; fi
cd ethereum && make tilt-deploy
cd ethereum && npx truffle exec scripts/register_tilt_contributors.js --network eth_devnet
node tools/lib/register_tilt_contributors.js
cp tilt.json sdk/js/src/icco/__tests__/tilt.json

.PHONY: tilt-test
## Run Integration Test in Tilt
tilt-test: sdk
tilt-test: sdk sdk/js/src/icco/__tests__/tilt.json
@if ! pgrep tilt; then echo "Error: tilt not running. Start it before running tests"; exit 1; fi
cd sdk/js && npm run build && npm run test

sdk/js/src/icco/__tests__/tilt.json:
cp tilt.json sdk/js/src/icco/__tests__/tilt.json
151 changes: 0 additions & 151 deletions devnet/eth-devnet.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions tools/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
lib
Loading

0 comments on commit 954901d

Please sign in to comment.