Remove Babel

package.json

@@ -37,11 +37,6 @@
   },
   "homepage": "https://github.com/OpenZeppelin/zeppelin-solidity",
   "devDependencies": {
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-stage-2": "^6.18.0",
-    "babel-preset-stage-3": "^6.17.0",
-    "babel-register": "^6.26.0",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.0.0",
     "chai-bignumber": "^2.0.2",

test/Bounty.test.js

@@ -1,10 +1,11 @@
-import { ethGetBalance, ethSendTransaction } from './helpers/web3';
+const { ethGetBalance, ethSendTransaction } = require('./helpers/web3');
+
+var SecureTargetBounty = artifacts.require('SecureTargetBounty');
+var InsecureTargetBounty = artifacts.require('InsecureTargetBounty');
 
 const sendReward = async (from, to, value) => ethSendTransaction({
   from, to, value,
 });
-var SecureTargetBounty = artifacts.require('SecureTargetBounty');
-var InsecureTargetBounty = artifacts.require('InsecureTargetBounty');
 
 function awaitEvent (event, handler) {
   return new Promise((resolve, reject) => {

test/Heritable.test.js

@@ -1,6 +1,6 @@
-import increaseTime from './helpers/increaseTime';
-import expectThrow from './helpers/expectThrow';
-import assertRevert from './helpers/assertRevert';
+const { increaseTime } = require('./helpers/increaseTime');
+const { expectThrow } = require('./helpers/expectThrow');
+const { assertRevert } = require('./helpers/assertRevert');
 
 const NULL_ADDRESS = '0x0000000000000000000000000000000000000000';
 

test/LimitBalance.test.js

@@ -1,5 +1,5 @@
-import assertRevert from './helpers/assertRevert';
-import { ethGetBalance } from './helpers/web3';
+const { assertRevert } = require('./helpers/assertRevert');
+const { ethGetBalance } = require('./helpers/web3');
 
 var LimitBalanceMock = artifacts.require('LimitBalanceMock');
 

test/ReentrancyGuard.test.js

@@ -1,5 +1,4 @@
-
-import expectThrow from './helpers/expectThrow';
+const { expectThrow } = require('./helpers/expectThrow');
 const ReentrancyMock = artifacts.require('ReentrancyMock');
 const ReentrancyAttack = artifacts.require('ReentrancyAttack');
 

test/SimpleSavingsWallet.test.js

@@ -1,6 +1,5 @@
-
-import expectThrow from './helpers/expectThrow';
-import { ethGetBalance, ethSendTransaction } from './helpers/web3';
+const { expectThrow } = require('./helpers/expectThrow');
+const { ethGetBalance, ethSendTransaction } = require('./helpers/web3');
 
 const SimpleSavingsWallet = artifacts.require('SimpleSavingsWallet');
 

test/access/SignatureBouncer.test.js

@@ -1,26 +1,25 @@
-
-import assertRevert from '../helpers/assertRevert';
-import { signHex } from '../helpers/sign';
+const { assertRevert } = require('../helpers/assertRevert');
+const { signHex } = require('../helpers/sign');
 
 const Bouncer = artifacts.require('SignatureBouncerMock');
 
 require('chai')
   .use(require('chai-as-promised'))
   .should();
 
-export const getSigner = (contract, signer, data = '') => (addr) => {
+const getSigner = (contract, signer, data = '') => (addr) => {
   // via: https://github.com/OpenZeppelin/zeppelin-solidity/pull/812/files
   const message = contract.address.substr(2) + addr.substr(2) + data;
   // ^ substr to remove `0x` because in solidity the address is a set of byes, not a string `0xabcd`
   return signHex(signer, message);
 };
 
-export const getMethodId = (methodName, ...paramTypes) => {
+const getMethodId = (methodName, ...paramTypes) => {
   // methodId is a sha3 of the first 4 bytes after 0x of 'method(paramType1,...)'
   return web3.sha3(`${methodName}(${paramTypes.join(',')})`).substr(2, 8);
 };
 
-export const stripAndPadHexValue = (hexVal, sizeInBytes, start = true) => {
+const stripAndPadHexValue = (hexVal, sizeInBytes, start = true) => {
   // strip 0x from the font and pad with 0's for
   const strippedHexVal = hexVal.substr(2);
   return start ? strippedHexVal.padStart(sizeInBytes * 2, 0) : strippedHexVal.padEnd(sizeInBytes * 2, 0);

test/crowdsale/AllowanceCrowdsale.test.js

@@ -1,7 +1,6 @@
-
-import ether from '../helpers/ether';
-import assertRevert from '../helpers/assertRevert';
-import { ethGetBalance } from '../helpers/web3';
+const { ether } = require('../helpers/ether');
+const { assertRevert } = require('../helpers/assertRevert');
+const { ethGetBalance } = require('../helpers/web3');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/CappedCrowdsale.test.js

@@ -1,5 +1,5 @@
-import ether from '../helpers/ether';
-import EVMRevert from '../helpers/EVMRevert';
+const { ether } = require('../helpers/ether');
+const { EVMRevert } = require('../helpers/EVMRevert');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/Crowdsale.test.js

@@ -1,5 +1,5 @@
-import ether from '../helpers/ether';
-import { ethGetBalance } from '../helpers/web3';
+const { ether } = require('../helpers/ether');
+const { ethGetBalance } = require('../helpers/web3');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/FinalizableCrowdsale.test.js

@@ -1,7 +1,7 @@
-import { advanceBlock } from '../helpers/advanceToBlock';
-import { increaseTimeTo, duration } from '../helpers/increaseTime';
-import latestTime from '../helpers/latestTime';
-import EVMRevert from '../helpers/EVMRevert';
+const { advanceBlock } = require('../helpers/advanceToBlock');
+const { increaseTimeTo, duration } = require('../helpers/increaseTime');
+const { latestTime } = require('../helpers/latestTime');
+const { EVMRevert } = require('../helpers/EVMRevert');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/IncreasingPriceCrowdsale.test.js

@@ -1,7 +1,7 @@
-import ether from '../helpers/ether';
-import { advanceBlock } from '../helpers/advanceToBlock';
-import { increaseTimeTo, duration } from '../helpers/increaseTime';
-import latestTime from '../helpers/latestTime';
+const { ether } = require('../helpers/ether');
+const { advanceBlock } = require('../helpers/advanceToBlock');
+const { increaseTimeTo, duration } = require('../helpers/increaseTime');
+const { latestTime } = require('../helpers/latestTime');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/IndividuallyCappedCrowdsale.test.js

@@ -1,5 +1,5 @@
-import ether from '../helpers/ether';
-import EVMRevert from '../helpers/EVMRevert';
+const { ether } = require('../helpers/ether');
+const { EVMRevert } = require('../helpers/EVMRevert');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/MintedCrowdsale.behaviour.js

@@ -1,4 +1,4 @@
-import { ethGetBalance } from '../helpers/web3';
+const { ethGetBalance } = require('../helpers/web3');
 
 const BigNumber = web3.BigNumber;
 
@@ -7,7 +7,7 @@ const should = require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
-export default function ([_, investor, wallet, purchaser], rate, value) {
+function shouldBehaveLikeMintedCrowdsale ([_, investor, wallet, purchaser], rate, value) {
   const expectedTokenAmount = rate.mul(value);
 
   describe('as a minted crowdsale', function () {
@@ -44,3 +44,7 @@ export default function ([_, investor, wallet, purchaser], rate, value) {
     });
   });
 }
+
+module.exports = {
+  shouldBehaveLikeMintedCrowdsale,
+};

test/crowdsale/MintedCrowdsale.test.js

@@ -1,5 +1,5 @@
-import shouldBehaveLikeMintedCrowdsale from './MintedCrowdsale.behaviour';
-import ether from '../helpers/ether';
+const { shouldBehaveLikeMintedCrowdsale } = require('./MintedCrowdsale.behaviour');
+const { ether } = require('../helpers/ether');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/PostDeliveryCrowdsale.test.js

@@ -1,8 +1,8 @@
-import { advanceBlock } from '../helpers/advanceToBlock';
-import { increaseTimeTo, duration } from '../helpers/increaseTime';
-import latestTime from '../helpers/latestTime';
-import EVMRevert from '../helpers/EVMRevert';
-import ether from '../helpers/ether';
+const { advanceBlock } = require('../helpers/advanceToBlock');
+const { increaseTimeTo, duration } = require('../helpers/increaseTime');
+const { latestTime } = require('../helpers/latestTime');
+const { EVMRevert } = require('../helpers/EVMRevert');
+const { ether } = require('../helpers/ether');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/RefundableCrowdsale.test.js

@@ -1,9 +1,9 @@
-import ether from '../helpers/ether';
-import { advanceBlock } from '../helpers/advanceToBlock';
-import { increaseTimeTo, duration } from '../helpers/increaseTime';
-import latestTime from '../helpers/latestTime';
-import EVMRevert from '../helpers/EVMRevert';
-import { ethGetBalance } from '../helpers/web3';
+const { ether } = require('../helpers/ether');
+const { advanceBlock } = require('../helpers/advanceToBlock');
+const { increaseTimeTo, duration } = require('../helpers/increaseTime');
+const { latestTime } = require('../helpers/latestTime');
+const { EVMRevert } = require('../helpers/EVMRevert');
+const { ethGetBalance } = require('../helpers/web3');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/TimedCrowdsale.test.js

@@ -1,8 +1,8 @@
-import ether from '../helpers/ether';
-import { advanceBlock } from '../helpers/advanceToBlock';
-import { increaseTimeTo, duration } from '../helpers/increaseTime';
-import latestTime from '../helpers/latestTime';
-import EVMRevert from '../helpers/EVMRevert';
+const { ether } = require('../helpers/ether');
+const { advanceBlock } = require('../helpers/advanceToBlock');
+const { increaseTimeTo, duration } = require('../helpers/increaseTime');
+const { latestTime } = require('../helpers/latestTime');
+const { EVMRevert } = require('../helpers/EVMRevert');
 
 const BigNumber = web3.BigNumber;
 

test/crowdsale/WhitelistedCrowdsale.test.js

@@ -1,4 +1,4 @@
-import ether from '../helpers/ether';
+const { ether } = require('../helpers/ether');
 
 const BigNumber = web3.BigNumber;
 

test/examples/SampleCrowdsale.test.js

@@ -1,10 +1,10 @@
-import ether from '../helpers/ether';
-import { advanceBlock } from '../helpers/advanceToBlock';
-import { increaseTimeTo, duration } from '../helpers/increaseTime';
-import latestTime from '../helpers/latestTime';
-import EVMRevert from '../helpers/EVMRevert';
-import assertRevert from '../helpers/assertRevert';
-import { ethGetBalance } from '../helpers/web3';
+const { ether } = require('../helpers/ether');
+const { advanceBlock } = require('../helpers/advanceToBlock');
+const { increaseTimeTo, duration } = require('../helpers/increaseTime');
+const { latestTime } = require('../helpers/latestTime');
+const { EVMRevert } = require('../helpers/EVMRevert');
+const { assertRevert } = require('../helpers/assertRevert');
+const { ethGetBalance } = require('../helpers/web3');
 
 const BigNumber = web3.BigNumber;
 

test/examples/SimpleToken.test.js

@@ -1,4 +1,4 @@
-import decodeLogs from '../helpers/decodeLogs';
+const { decodeLogs } = require('../helpers/decodeLogs');
 const SimpleToken = artifacts.require('SimpleToken');
 
 contract('SimpleToken', accounts => {

test/helpers/EVMRevert.js

@@ -1 +1,5 @@
-export default 'revert';
+const EVMRevert = 'revert';
+
+module.exports = {
+  EVMRevert,
+};

test/helpers/EVMThrow.js

@@ -1 +1,5 @@
-export default 'invalid opcode';
+const EVMThrow = 'invalid opcode';
+
+module.exports = {
+  EVMThrow,
+};

test/helpers/advanceToBlock.js

@@ -1,4 +1,4 @@
-export function advanceBlock () {
+function advanceBlock () {
   return new Promise((resolve, reject) => {
     web3.currentProvider.sendAsync({
       jsonrpc: '2.0',
@@ -11,7 +11,7 @@ export function advanceBlock () {
 }
 
 // Advances the block number so that the last mined block is `number`.
-export default async function advanceToBlock (number) {
+async function advanceToBlock (number) {
   if (web3.eth.blockNumber > number) {
     throw Error(`block number ${number} is in the past (current is ${web3.eth.blockNumber})`);
   }
@@ -20,3 +20,8 @@ export default async function advanceToBlock (number) {
     await advanceBlock();
   }
 }
+
+module.exports = {
+  advanceBlock,
+  advanceToBlock,
+};

test/helpers/assertJump.js

@@ -1,9 +1,13 @@
-export default async promise => {
+async function assertJump (promise) {
   try {
     await promise;
     assert.fail('Expected invalid opcode not received');
   } catch (error) {
     const invalidOpcodeReceived = error.message.search('invalid opcode') >= 0;
     assert(invalidOpcodeReceived, `Expected "invalid opcode", got ${error} instead`);
   }
+}
+
+module.exports = {
+  assertJump,
 };

test/helpers/assertRevert.js

@@ -1,9 +1,13 @@
-export default async promise => {
+async function assertRevert (promise) {
   try {
     await promise;
     assert.fail('Expected revert not received');
   } catch (error) {
     const revertFound = error.message.search('revert') >= 0;
     assert(revertFound, `Expected "revert", got ${error} instead`);
   }
+}
+
+module.exports = {
+  assertRevert,
 };

test/helpers/decodeLogs.js

@@ -1,8 +1,12 @@
 const SolidityEvent = require('web3/lib/web3/event.js');
 
-export default function decodeLogs (logs, contract, address) {
+function decodeLogs (logs, contract, address) {
   return logs.map(log => {
     const event = new SolidityEvent(null, contract.events[log.topics[0]], address);
     return event.decode(log);
   });
 }
+
+module.exports = {
+  decodeLogs,
+};

test/helpers/ether.js

@@ -1,3 +1,7 @@
-export default function ether (n) {
+function ether (n) {
   return new web3.BigNumber(web3.toWei(n, 'ether'));
 }
+
+module.exports = {
+  ether,
+};