cerc-io/solidity
11
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

Merge pull request #1651 from ethereum/transfer-method

Browse Source 
Add address.transfer(value)
This commit is contained in:
chriseth
2017-02-24 15:42:52 +01:00
committed by GitHub
parent bec3c6fab6 4d290e551c
commit 673268a6f8
11 changed files with 85 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityEndToEndTest.cpp
+36
View File
@@ -1681,6 +1681,42 @@ BOOST_AUTO_TEST_CASE(send_ether)
BOOST_CHECK_EQUAL(balanceAt(address), amount);
}
BOOST_AUTO_TEST_CASE(transfer_ether)
{
char const* sourceCode = R"(
contract A {
function A() payable {}
function a(address addr, uint amount) returns (uint) {
addr.transfer(amount);
return this.balance;
}
function b(address addr, uint amount) {
addr.transfer(amount);
}
}
contract B {
}
contract C {
function () payable {
throw;
}
}
)";
compileAndRun(sourceCode, 0, "B");
u160 const nonPayableRecipient = m_contractAddress;
compileAndRun(sourceCode, 0, "C");
u160 const oogRecipient = m_contractAddress;
compileAndRun(sourceCode, 20, "A");
u160 payableRecipient(23);
BOOST_CHECK(callContractFunction("a(address,uint256)", payableRecipient, 10) == encodeArgs(10));
BOOST_CHECK_EQUAL(balanceAt(payableRecipient), 10);
BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 10);
BOOST_CHECK(callContractFunction("b(address,uint256)", nonPayableRecipient, 10) == encodeArgs());
BOOST_CHECK(callContractFunction("b(address,uint256)", oogRecipient, 10) == encodeArgs());
}
BOOST_AUTO_TEST_CASE(log0)
{
char const* sourceCode = R"(
test/libsolidity/SolidityNameAndTypeResolution.cpp
+18
View File
@@ -5108,6 +5108,24 @@ BOOST_AUTO_TEST_CASE(early_exit_on_fatal_errors)
CHECK_ERROR(text, DeclarationError, "Identifier not found or not unique");
}
BOOST_AUTO_TEST_CASE(address_methods)
{
char const* text = R"(
contract C {
function f() {
address addr;
uint balance = addr.balance;
bool callRet = addr.call();
bool callcodeRet = addr.callcode();
bool delegatecallRet = addr.delegatecall();
bool sendRet = addr.send(1);
addr.transfer(1);
}
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_SUITE_END()
}