cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use latest solcjs and replace compileStandard by compile.

Browse Source
This commit is contained in:
chriseth 2018-10-31 13:39:32 +01:00 committed by Alex Beregszaszi
parent b6c3257752
commit 28d98d61ef
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/bytecodecompare/storebytecode.sh
View File

@ -40,8 +40,9 @@ TMPDIR=$(mktemp -d)
if [[ "$SOLC_EMSCRIPTEN" = "On" ]] if [[ "$SOLC_EMSCRIPTEN" = "On" ]]
then then
# npm install solc
git clone --depth 1 https://github.com/ethereum/solc-js.git solc
cp "$REPO_ROOT/build/libsolc/soljson.js" . cp "$REPO_ROOT/build/libsolc/soljson.js" .
npm install solc
cat > solc <<EOF cat > solc <<EOF
#!/usr/bin/env node #!/usr/bin/env node
var process = require('process') var process = require('process')

13
test/externalTests.sh
View File

@ -55,7 +55,16 @@ function test_truffle
cd "$DIR" cd "$DIR"
echo "Current commit hash: `git rev-parse HEAD`" echo "Current commit hash: `git rev-parse HEAD`"
npm install npm install
find . -name soljson.js -exec cp "$SOLJSON" {} \; # Replace solc package by master
for d in node_modules node_modules/truffle/node_modules
do
(
cd $d
rm -rf solc
git clone --depth 1 https://github.com/ethereum/solc-js.git solc
cp "$SOLJSON" solc/
)
done
if [ "$name" == "Zeppelin" -o "$name" == "Gnosis" ]; then if [ "$name" == "Zeppelin" -o "$name" == "Gnosis" ]; then
echo "Replaced fixed-version pragmas..." echo "Replaced fixed-version pragmas..."
# Replace fixed-version pragmas in Gnosis (part of Consensys best practice) # Replace fixed-version pragmas in Gnosis (part of Consensys best practice)
@ -68,6 +77,8 @@ function test_truffle
rm "$assertsol" rm "$assertsol"
wget https://raw.githubusercontent.com/trufflesuite/truffle-core/ef31bcaa15dbd9bd0f6a0070a5c63f271cde2dbc/lib/testing/Assert.sol -o "$assertsol" wget https://raw.githubusercontent.com/trufflesuite/truffle-core/ef31bcaa15dbd9bd0f6a0070a5c63f271cde2dbc/lib/testing/Assert.sol -o "$assertsol"
fi fi
# Change "compileStandard" to "compile"
sed -i s/solc.compileStandard/solc.compile/ "node_modules/truffle/build/cli.bundled.js"
npm run test npm run test
) )
rm -rf "$DIR" rm -rf "$DIR"