Update to Truffle 4.1.5 and Ganache 6.1.0 (#876)

* Update to ganache-cli v6.1.0 and truffle v4.1.0

* Update to stable version of ganache-cli

* fix: update event emission warning

- Fix event emission warnings for solidity 4.21 after truffle has been
updated to use this version

* fix pr review comments

* update to truffle v4.1.5

* update package-lock

* add additional emit keywords

* update solidity-coverage to 0.4.15

* update to solium 1.1.6

* fix MerkleProof coverage analysis by testing through wrapper

* change version pragma to ^0.4.21

* fix solium linting errors
This commit is contained in:
Francisco Giordano
2018-04-09 20:48:32 -03:00
committed by GitHub
parent 06666be93a
commit a7e91856f3
118 changed files with 2247 additions and 920 deletions

View File

@ -7,23 +7,23 @@ set -o errexit
trap cleanup EXIT
cleanup() {
# Kill the testrpc instance that we started (if we started one and if it's still running).
if [ -n "$testrpc_pid" ] && ps -p $testrpc_pid > /dev/null; then
kill -9 $testrpc_pid
# Kill the ganache instance that we started (if we started one and if it's still running).
if [ -n "$ganache_pid" ] && ps -p $ganache_pid > /dev/null; then
kill -9 $ganache_pid
fi
}
if [ "$SOLIDITY_COVERAGE" = true ]; then
testrpc_port=8555
ganache_port=8555
else
testrpc_port=8545
ganache_port=8545
fi
testrpc_running() {
nc -z localhost "$testrpc_port"
ganache_running() {
nc -z localhost "$ganache_port"
}
start_testrpc() {
start_ganache() {
# We define 10 accounts with balance 1M ether, needed for high-value tests.
local accounts=(
--account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200,1000000000000000000000000"
@ -39,19 +39,19 @@ start_testrpc() {
)
if [ "$SOLIDITY_COVERAGE" = true ]; then
node_modules/.bin/testrpc-sc --gasLimit 0xfffffffffff --port "$testrpc_port" "${accounts[@]}" > /dev/null &
node_modules/.bin/testrpc-sc --gasLimit 0xfffffffffff --port "$ganache_port" "${accounts[@]}" > /dev/null &
else
node_modules/.bin/testrpc --gasLimit 0xfffffffffff "${accounts[@]}" > /dev/null &
node_modules/.bin/ganache-cli --gasLimit 0xfffffffffff "${accounts[@]}" > /dev/null &
fi
testrpc_pid=$!
ganache_pid=$!
}
if testrpc_running; then
echo "Using existing testrpc instance"
if ganache_running; then
echo "Using existing ganache instance"
else
echo "Starting our own testrpc instance"
start_testrpc
echo "Starting our own ganache instance"
start_ganache
fi
if [ "$SOLIDITY_COVERAGE" = true ]; then