NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to Truffle version 3.2.2 and Solidity version 0.4.11

Browse Source
This commit is contained in:
David Knott
2017-06-06 21:26:24 -06:00
parent c3cb0dcf80
commit 6ede3d9001
56 changed files with 71 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/helpers/expectThrow.js
View File

@ -4,14 +4,14 @@ export default async promise => {
} catch (error) {
// TODO: Check jump destination to destinguish between a throw
// and an actual invalid jump.
const invalidJump = error.message.search('invalid JUMP') >= 0;
const invalidOpcode = error.message.search('invalid opcode') >= 0;
// TODO: When we contract A calls contract B, and B throws, instead
// of an 'invalid jump', we get an 'out of gas' error. How do
// we distinguish this from an actual out of gas event? (The
// testrpc log actually show an 'invalid jump' event.)
const outOfGas = error.message.search('out of gas') >= 0;
assert(
invalidJump || outOfGas,
invalidOpcode || outOfGas,
"Expected throw, got '" + error + "' instead",
);
return;