Skip to content

Commit 0c5c31f

Browse files
committed
(feat) change assert to require
1 parent 4521a1b commit 0c5c31f

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ archive/*
99
coverage/*
1010
coverage.json
1111
coverageEnv/*
12-
.coveralls.yml
12+
.coveralls.yml
13+
DEPLOYMENT.MD

contracts/Basket.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ contract Basket is StandardToken {
103103
for (uint i = 0; i < tokens.length; i++) {
104104
address t = tokens[i];
105105
uint w = weights[i];
106-
assert(ERC20(t).transferFrom(msg.sender, this, w.mul(_quantity).div(10 ** decimals)));
106+
require(ERC20(t).transferFrom(msg.sender, this, w.mul(_quantity).div(10 ** decimals)));
107107
}
108108

109109
// charging suppliers a fee for every new basket minted
@@ -129,7 +129,7 @@ contract Basket is StandardToken {
129129
/// @param _quantity Quantity of basket tokens to convert back to original tokens
130130
/// @return success Operation successful
131131
function debundleAndWithdraw(uint _quantity) public returns (bool success) {
132-
assert(debundle(_quantity, msg.sender, msg.sender));
132+
require(debundle(_quantity, msg.sender, msg.sender));
133133
emit LogDebundleAndWithdraw(msg.sender, _quantity);
134134
return true;
135135
}
@@ -185,7 +185,7 @@ contract Basket is StandardToken {
185185
uint bal = outstandingBalance[msg.sender][_token];
186186
require(bal > 0);
187187
outstandingBalance[msg.sender][_token] = 0;
188-
assert(ERC20(_token).transfer(msg.sender, bal));
188+
require(ERC20(_token).transfer(msg.sender, bal));
189189

190190
emit LogWithdraw(msg.sender, _token, bal);
191191
return true;

contracts/BasketEscrow.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ contract BasketEscrow {
136136
public
137137
returns (bool success)
138138
{
139-
assert(ERC20(_basketAddress).transferFrom(msg.sender, this, _amountBasket));
139+
require(ERC20(_basketAddress).transferFrom(msg.sender, this, _amountBasket));
140140
uint index = _createOrder(msg.sender, ETH_ADDRESS, _amountEth, _basketAddress, _amountBasket, _expiration, _nonce);
141141

142142
emit LogSellOrderCreated(index, msg.sender, _basketAddress, _amountEth, _amountBasket, _expiration, _nonce);
@@ -223,7 +223,7 @@ contract BasketEscrow {
223223
) public returns (bool success) {
224224
uint cancelledOrderIndex = _cancelOrder(msg.sender, ETH_ADDRESS, _amountEth, _basketAddress, _amountBasket, _expiration, _nonce);
225225

226-
assert(ERC20(_basketAddress).transfer(msg.sender, _amountBasket));
226+
require(ERC20(_basketAddress).transfer(msg.sender, _amountBasket));
227227

228228
emit LogSellOrderCancelled(cancelledOrderIndex, msg.sender, _basketAddress, _amountEth, _amountBasket);
229229
return true;
@@ -278,7 +278,7 @@ contract BasketEscrow {
278278
uint _nonce
279279
) public returns (bool success) {
280280
uint filledOrderIndex = _fillOrder(_orderCreator, _basketAddress, _amountBasket, ETH_ADDRESS, _amountEth, _expiration, _nonce);
281-
assert(ERC20(_basketAddress).transferFrom(msg.sender, _orderCreator, _amountBasket));
281+
require(ERC20(_basketAddress).transferFrom(msg.sender, _orderCreator, _amountBasket));
282282

283283
uint fee = _amountEth.mul(transactionFee).div(10 ** FEE_DECIMALS);
284284
msg.sender.transfer(_amountEth.sub(fee));
@@ -303,7 +303,7 @@ contract BasketEscrow {
303303
uint _nonce
304304
) public payable returns (bool success) {
305305
uint filledOrderIndex = _fillOrder(_orderCreator, ETH_ADDRESS, msg.value, _basketAddress, _amountBasket, _expiration, _nonce);
306-
assert(ERC20(_basketAddress).transfer(msg.sender, _amountBasket));
306+
require(ERC20(_basketAddress).transfer(msg.sender, _amountBasket));
307307

308308
uint fee = msg.value.mul(transactionFee).div(10 ** FEE_DECIMALS);
309309
_orderCreator.transfer(msg.value.sub(fee));

0 commit comments

Comments
 (0)