aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2018-04-19 07:25:48 +0800
committerGitHub <noreply@github.com>2018-04-19 07:25:48 +0800
commitd577f06ad8951b42f8df6fa0e9feca90eb2785eb (patch)
tree70345baf9dd3d5dc1a892f462a7180d06116222d
parent39b7b44a8d63c9e50911ba724221b4a6399e7f5e (diff)
parente22929ebb8f33048bfc3eed2b6909ae539b4e221 (diff)
downloaddexon-solidity-d577f06ad8951b42f8df6fa0e9feca90eb2785eb.tar
dexon-solidity-d577f06ad8951b42f8df6fa0e9feca90eb2785eb.tar.gz
dexon-solidity-d577f06ad8951b42f8df6fa0e9feca90eb2785eb.tar.bz2
dexon-solidity-d577f06ad8951b42f8df6fa0e9feca90eb2785eb.tar.lz
dexon-solidity-d577f06ad8951b42f8df6fa0e9feca90eb2785eb.tar.xz
dexon-solidity-d577f06ad8951b42f8df6fa0e9feca90eb2785eb.tar.zst
dexon-solidity-d577f06ad8951b42f8df6fa0e9feca90eb2785eb.zip
Merge pull request #3928 from ethereum/removeZeppelinPatches
Remove Zeppelin patches.
-rwxr-xr-xtest/externalTests.sh7
1 files changed, 0 insertions, 7 deletions
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 2a5ff7ef..cd6deb75 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -47,13 +47,6 @@ function test_truffle
cd "$DIR"
npm install
find . -name soljson.js -exec cp "$SOLJSON" {} \;
- if [ "$name" == "Zeppelin" ]; then
- # Fix some things that look like bugs (only seemed to fail on Node 6 and not Node 8)
- # FIXME: report upstream or to web3.js?
- sed -i -e 's/let token = await ERC827TokenMock.new();//;' test/token/ERC827/ERC827Token.js
- sed -i -e 's/CappedCrowdsale.new(this.startTime, this.endTime, rate, wallet, 0)/CappedCrowdsale.new(this.startTime, this.endTime, rate, wallet, 0, this.token.address)/' test/crowdsale/CappedCrowdsale.test.js
- sed -i -e 's/RefundableCrowdsale.new(this.startTime, this.endTime, rate, wallet, 0, { from: owner })/RefundableCrowdsale.new(this.startTime, this.endTime, rate, wallet, 0, this.token.address, { from: owner })/' test/crowdsale/RefundableCrowdsale.test.js
- fi
if [ "$name" == "Gnosis" ]; then
# Replace fixed-version pragmas in Gnosis (part of Consensys best practice)
find contracts test -name '*.sol' -type f -print0 | xargs -0 sed -i -e 's/pragma solidity 0/pragma solidity ^0/'