@@ -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