Add test:circleci command, add newlines to end of contracts

This commit is contained in:
Amir Bandeali
2017-12-11 23:01:39 -08:00
parent b97f140b78
commit 145fea5253
25 changed files with 25 additions and 2 deletions

View File

@@ -600,3 +600,4 @@ contract Exchange is SafeMath {
return Token(token).allowance.gas(EXTERNAL_QUERY_GAS_LIMIT)(owner, TOKEN_TRANSFER_PROXY_CONTRACT); // Limit gas to prevent reentrancy
}
}

View File

@@ -306,3 +306,4 @@ contract TokenRegistry is Ownable {
return tokenAddresses;
}
}

View File

@@ -113,3 +113,4 @@ contract TokenTransferProxy is Ownable {
return authorities;
}
}

View File

@@ -363,3 +363,4 @@ contract MultiSigWallet {
_transactionIds[i - from] = transactionIdsTemp[i];
}
}

View File

@@ -130,3 +130,4 @@ contract MultiSigWalletWithTimeLock is MultiSigWallet {
ConfirmationTimeSet(transactionId, confirmationTime);
}
}

View File

@@ -80,3 +80,4 @@ contract MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress is MultiSigWall
return true;
}
}

View File

@@ -33,3 +33,4 @@ contract DummyToken is Mintable, Ownable {
balances[_target] = _value;
}
}

View File

@@ -35,3 +35,4 @@ contract DummyToken_v2 is Mintable_v2, Ownable_v2 {
balances[_target] = _value;
}
}

View File

@@ -29,3 +29,4 @@ contract MaliciousToken is StandardToken {
return allowed[_owner][_spender];
}
}

View File

@@ -16,3 +16,4 @@ contract Mintable is UnlimitedAllowanceToken, SafeMath {
totalSupply = safeAdd(totalSupply, _value);
}
}

View File

@@ -16,3 +16,4 @@ contract Mintable_v2 is UnlimitedAllowanceToken_v2, SafeMath_v2 {
totalSupply = safeAdd(totalSupply, _value);
}
}

View File

@@ -55,4 +55,4 @@ contract ERC20Token is Token_v2 {
mapping (address => uint) balances;
mapping (address => mapping (address => uint)) allowed;
uint public totalSupply;
}
}

View File

@@ -54,3 +54,4 @@ contract EtherToken is UnlimitedAllowanceToken, SafeMath {
require(msg.sender.send(amount));
}
}

View File

@@ -56,3 +56,4 @@ contract EtherToken_v2 is UnlimitedAllowanceToken_v2, SafeMath_v2 {
Transfer(msg.sender, address(0), _value);
}
}

View File

@@ -42,3 +42,4 @@ contract StandardToken is Token {
mapping (address => mapping (address => uint)) allowed;
uint public totalSupply;
}

View File

@@ -35,4 +35,4 @@ contract Token {
event Transfer(address indexed _from, address indexed _to, uint _value);
event Approval(address indexed _owner, address indexed _spender, uint _value);
}
}

View File

@@ -36,3 +36,4 @@ contract Token_v2 {
event Transfer(address indexed _from, address indexed _to, uint _value);
event Approval(address indexed _owner, address indexed _spender, uint _value);
}

View File

@@ -50,3 +50,4 @@ contract UnlimitedAllowanceToken is StandardToken {
}
}
}

View File

@@ -44,3 +44,4 @@ contract UnlimitedAllowanceToken_v2 is ERC20Token {
return true;
}
}

View File

@@ -31,3 +31,4 @@ contract ZRXToken is UnlimitedAllowanceToken {
balances[msg.sender] = totalSupply;
}
}

View File

@@ -25,3 +25,4 @@ contract Ownable {
}
}
}

View File

@@ -30,3 +30,4 @@ contract Ownable_v2 {
}
}
}

View File

@@ -71,3 +71,4 @@ contract SafeMath {
return a < b ? a : b;
}
}

View File

@@ -71,3 +71,4 @@ contract SafeMath_v2 {
return a < b ? a : b;
}
}

View File

@@ -15,6 +15,7 @@
"migrate:truffle": "npm run build; truffle migrate",
"migrate": "npm run build; node lib/deploy/cli.js migrate",
"lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
"test:circleci": "yarn test; yarn test:deployer",
"test:deployer": "npm run build; mocha lib/deploy/test/*_test.js"
},
"repository": {