Merge branch 'release-v2.0.0' of github.com:OpenZeppelin/openzeppelin-solidity into release-v2.0.0

This commit is contained in:
Francisco Giordano
2018-09-26 18:19:41 -03:00
15 changed files with 174 additions and 326 deletions

View File

@ -45,7 +45,6 @@ contract Escrow is Initializable, Secondary {
*/
function withdraw(address payee) public onlyPrimary {
uint256 payment = _deposits[payee];
assert(address(this).balance >= payment);
_deposits[payee] = 0;

View File

@ -86,7 +86,6 @@ contract SplitPayment is Initializable {
);
require(payment != 0);
assert(address(this).balance >= payment);
_released[account] = _released[account].add(payment);
_totalReleased = _totalReleased.add(payment);