cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace throw with revert() in end-to-end tests

Browse Source
This commit is contained in:
Alex Beregszaszi 2018-07-12 00:43:19 +01:00 committed by chriseth
parent 21e97da294
commit aa08460d94
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/contracts/AuctionRegistrar.cpp
View File

@ -125,26 +125,26 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
emit Changed(_name);
if (previousOwner != 0x0000000000000000000000000000000000000000) {
if (!record.owner.send(auction.sumOfBids - auction.highestBid / 100))
throw;
revert();
} else {
if (!auction.highestBidder.send(auction.highestBid - auction.secondHighestBid))
throw;
revert();
}
}
function reserve(string _name) external payable {
if (bytes(_name).length == 0)
throw;
revert();
bool needAuction = requiresAuction(_name);
if (needAuction)
{
if (now < m_toRecord[_name].renewalDate)
throw;
revert();
bid(_name, msg.sender, msg.value);
} else {
Record storage record = m_toRecord[_name];
if (record.owner != 0x0000000000000000000000000000000000000000)
throw;
revert();
m_toRecord[_name].owner = msg.sender;
emit Changed(_name);
}

2
test/contracts/FixedFeeRegistrar.cpp
View File

@ -84,7 +84,7 @@ contract FixedFeeRegistrar is Registrar {
function disown(string memory _name, address _refund) onlyrecordowner(_name) {
delete m_recordData[uint(keccak256(bytes(_name))) / 8];
if (!_refund.send(c_fee))
throw;
revert();
emit Changed(_name);
}
function transfer(string memory _name, address _newOwner) onlyrecordowner(_name) {

16
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -2095,7 +2095,7 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
contract C {
function () external payable {
throw;
revert();
}
}
)";
@ -7741,7 +7741,7 @@ BOOST_AUTO_TEST_CASE(simple_throw)
if (x > 10)
return x + 10;
else
throw;
revert();
return 2;
}
}
@ -9603,7 +9603,7 @@ BOOST_AUTO_TEST_CASE(mutex)
contract mutexed {
bool locked;
modifier protected {
if (locked) throw;
if (locked) revert();
locked = true;
_;
locked = false;
@ -9615,16 +9615,16 @@ BOOST_AUTO_TEST_CASE(mutex)
function withdraw(uint amount) protected returns (uint) {
// NOTE: It is very bad practice to write this function this way.
// Please refer to the documentation of how to do this properly.
if (amount > shares) throw;
if (!msg.sender.call.value(amount)("")) throw;
if (amount > shares) revert();
if (!msg.sender.call.value(amount)("")) revert();
shares -= amount;
return shares;
}
function withdrawUnprotected(uint amount) public returns (uint) {
// NOTE: It is very bad practice to write this function this way.
// Please refer to the documentation of how to do this properly.
if (amount > shares) throw;
if (!msg.sender.call.value(amount)("")) throw;
if (amount > shares) revert();
if (!msg.sender.call.value(amount)("")) revert();
shares -= amount;
return shares;
}
@ -11159,7 +11159,7 @@ BOOST_AUTO_TEST_CASE(inline_assembly_in_modifiers)
a := 2
}
if (a != 2)
throw;
revert();
_;
}
function f() m public returns (bool) {