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

Address members not accessible by contract instance

Browse Source
This commit is contained in:
Leonardo Alt
2018-07-17 13:33:23 +01:00
parent 1d33f41c1a
commit 0075f4239a
27 changed files with 44 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityEndToEndTest.cpp
+26 -26
View File
@@ -2083,7 +2083,7 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
constructor() public payable {}
function a(address addr, uint amount) public returns (uint) {
addr.transfer(amount);
return this.balance;
return address(this).balance;
}
function b(address addr, uint amount) public {
addr.transfer(amount);
@@ -2790,10 +2790,10 @@ BOOST_AUTO_TEST_CASE(contracts_as_addresses)
}
contract test {
helper h;
constructor() public payable { h = new helper(); h.send(5); }
constructor() public payable { h = new helper(); address(h).send(5); }
function getBalance() public returns (uint256 myBalance, uint256 helperBalance) {
myBalance = this.balance;
helperBalance = h.balance;
myBalance = address(this).balance;
helperBalance = address(h).balance;
}
}
)";
@@ -2808,7 +2808,7 @@ BOOST_AUTO_TEST_CASE(gas_and_value_basic)
contract helper {
bool flag;
function getBalance() payable public returns (uint256 myBalance) {
return this.balance;
return address(this).balance;
}
function setFlag() public { flag = true; }
function getFlag() public returns (bool fl) { return flag; }
@@ -2825,7 +2825,7 @@ BOOST_AUTO_TEST_CASE(gas_and_value_basic)
}
function checkState() public returns (bool flagAfter, uint myBal) {
flagAfter = h.getFlag();
myBal = this.balance;
myBal = address(this).balance;
}
}
)";
@@ -2841,7 +2841,7 @@ BOOST_AUTO_TEST_CASE(value_complex)
char const* sourceCode = R"(
contract helper {
function getBalance() payable public returns (uint256 myBalance) {
return this.balance;
return address(this).balance;
}
}
contract test {
@@ -2862,7 +2862,7 @@ BOOST_AUTO_TEST_CASE(value_insane)
char const* sourceCode = R"(
contract helper {
function getBalance() payable public returns (uint256 myBalance) {
return this.balance;
return address(this).balance;
}
}
contract test {
@@ -2897,7 +2897,7 @@ BOOST_AUTO_TEST_CASE(value_for_constructor)
}
function getFlag() public returns (bool ret) { return h.getFlag(); }
function getName() public returns (bytes3 ret) { return h.getName(); }
function getBalances() public returns (uint me, uint them) { me = this.balance; them = h.balance;}
function getBalances() public returns (uint me, uint them) { me = address(this).balance; them = address(h).balance;}
}
)";
compileAndRun(sourceCode, 22, "Main");
@@ -3341,7 +3341,7 @@ BOOST_AUTO_TEST_CASE(default_fallback_throws)
char const* sourceCode = R"YY(
contract A {
function f() public returns (bool) {
return this.call("");
return address(this).call("");
}
}
)YY";
@@ -4066,7 +4066,7 @@ BOOST_AUTO_TEST_CASE(call_forward_bytes)
contract sender {
constructor() public { rec = new receiver(); }
function() external { savedData = msg.data; }
function forward() public returns (bool) { !rec.call(savedData); return true; }
function forward() public returns (bool) { !address(rec).call(savedData); return true; }
function clear() public returns (bool) { delete savedData; return true; }
function val() public returns (uint) { return rec.received(); }
receiver rec;
@@ -4095,18 +4095,18 @@ BOOST_AUTO_TEST_CASE(call_forward_bytes_length)
receiver rec;
constructor() public { rec = new receiver(); }
function viaCalldata() public returns (uint) {
require(rec.call(msg.data));
require(address(rec).call(msg.data));
return rec.calledLength();
}
function viaMemory() public returns (uint) {
bytes memory x = msg.data;
require(rec.call(x));
require(address(rec).call(x));
return rec.calledLength();
}
bytes s;
function viaStorage() public returns (uint) {
s = msg.data;
require(rec.call(s));
require(address(rec).call(s));
return rec.calledLength();
}
}
@@ -4137,8 +4137,8 @@ BOOST_AUTO_TEST_CASE(copying_bytes_multiassign)
constructor() public { rec = new receiver(); }
function() external { savedData1 = savedData2 = msg.data; }
function forward(bool selector) public returns (bool) {
if (selector) { rec.call(savedData1); delete savedData1; }
else { rec.call(savedData2); delete savedData2; }
if (selector) { address(rec).call(savedData1); delete savedData1; }
else { address(rec).call(savedData2); delete savedData2; }
return true;
}
function val() public returns (uint) { return rec.received(); }
@@ -4592,8 +4592,8 @@ BOOST_AUTO_TEST_CASE(bytes_in_arguments)
function g(uint a) public { result *= a; }
function test(uint a, bytes data1, bytes data2, uint b) external returns (uint r_a, uint r, uint r_b, uint l) {
r_a = a;
this.call(data1);
this.call(data2);
address(this).call(data1);
address(this).call(data2);
r = result;
r_b = b;
l = data1.length;
@@ -6472,7 +6472,7 @@ BOOST_AUTO_TEST_CASE(evm_exceptions_in_constructor_call_fail)
contract A {
constructor() public
{
this.call("123");
address(this).call("123");
}
}
contract B {
@@ -6536,7 +6536,7 @@ BOOST_AUTO_TEST_CASE(failing_send)
constructor() public payable {}
function callHelper(address _a) public returns (bool r, uint bal) {
r = !_a.send(5);
bal = this.balance;
bal = address(this).balance;
}
}
)";
@@ -6559,7 +6559,7 @@ BOOST_AUTO_TEST_CASE(send_zero_ether)
constructor() public payable {}
function s() public returns (bool) {
Receiver r = new Receiver();
return r.send(0);
return address(r).send(0);
}
}
)";
@@ -9742,7 +9742,7 @@ BOOST_AUTO_TEST_CASE(calling_nonexisting_contract_throws)
return 7;
}
function h() public returns (uint) {
d.call(""); // this does not throw (low-level)
address(d).call(""); // this does not throw (low-level)
return 7;
}
}
@@ -11503,7 +11503,7 @@ BOOST_AUTO_TEST_CASE(bubble_up_error_messages_through_transfer)
revert("message");
}
function f() public {
this.transfer(0);
address(this).transfer(0);
}
}
contract C {
@@ -11778,13 +11778,13 @@ BOOST_AUTO_TEST_CASE(delegatecall_return_value)
return value;
}
function get_delegated() external returns (bool) {
return this.delegatecall(abi.encodeWithSignature("get()"));
return address(this).delegatecall(abi.encodeWithSignature("get()"));
}
function assert0() external view {
assert(value == 0);
}
function assert0_delegated() external returns (bool) {
return this.delegatecall(abi.encodeWithSignature("assert0()"));
return address(this).delegatecall(abi.encodeWithSignature("assert0()"));
}
}
)DELIMITER";
@@ -12494,7 +12494,7 @@ BOOST_AUTO_TEST_CASE(abi_encode_call)
uint[] memory b = new uint[](2);
b[0] = 6;
b[1] = 7;
require(this.call(abi.encodeWithSignature("c(uint256,uint256[])", a, b)));
require(address(this).call(abi.encodeWithSignature("c(uint256,uint256[])", a, b)));
return x;
}
}