aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ExecutionFramework.cpp7
-rw-r--r--test/liblll/EndToEndTest.cpp229
-rw-r--r--test/libsolidity/SolidityNameAndTypeResolution.cpp90
3 files changed, 323 insertions, 3 deletions
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index 9e3ecac3..ddcd9cb6 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -62,7 +62,7 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
cout << "CALL " << m_sender.hex() << " -> " << m_contractAddress.hex() << ":" << endl;
if (_value > 0)
cout << " value: " << _value << endl;
- cout << " in: " << toHex(_data) << endl;
+ cout << " in: " << toHex(_data) << endl;
}
RPCSession::TransactionData d;
d.data = "0x" + toHex(_data);
@@ -91,7 +91,10 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
}
if (m_showMessages)
- cout << " out: " << toHex(m_output) << endl;
+ {
+ cout << " out: " << toHex(m_output) << endl;
+ cout << " tx hash: " << txHash << endl;
+ }
m_gasUsed = u256(receipt.gasUsed);
m_logs.clear();
diff --git a/test/liblll/EndToEndTest.cpp b/test/liblll/EndToEndTest.cpp
index b5e32e94..77c1f740 100644
--- a/test/liblll/EndToEndTest.cpp
+++ b/test/liblll/EndToEndTest.cpp
@@ -43,6 +43,235 @@ BOOST_AUTO_TEST_CASE(smoke_test)
BOOST_CHECK(callFallback() == encodeArgs(string("test", 4)));
}
+BOOST_AUTO_TEST_CASE(bare_panic)
+{
+ char const* sourceCode = "(panic)";
+ compileAndRunWithoutCheck(sourceCode);
+ BOOST_REQUIRE(m_output.empty());
+}
+
+BOOST_AUTO_TEST_CASE(exp_operator_const)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (return (exp 2 3)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == toBigEndian(u256(8)));
+}
+
+BOOST_AUTO_TEST_CASE(exp_operator_const_signed)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (return (exp (- 0 2) 3)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == toBigEndian(u256(-8)));
+}
+
+BOOST_AUTO_TEST_CASE(exp_operator_on_range)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0xb3de648b)
+ (return (exp 2 (calldataload 0x04))))
+ (jump 0x02)))
+ )";
+ compileAndRun(sourceCode);
+ testContractAgainstCppOnRange("f(uint256)", [](u256 const& a) -> u256 { return u256(1 << a.convert_to<int>()); }, 0, 16);
+}
+
+BOOST_AUTO_TEST_CASE(constructor_argument_internal_numeric)
+{
+ char const* sourceCode = R"(
+ (seq
+ (sstore 0x00 65535)
+ (returnlll
+ (return @@0x00)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(u256(65535)));
+}
+
+BOOST_AUTO_TEST_CASE(constructor_argument_internal_string)
+{
+ char const* sourceCode = R"(
+ (seq
+ (sstore 0x00 "test")
+ (returnlll
+ (return @@0x00)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs("test"));
+}
+
+BOOST_AUTO_TEST_CASE(constructor_arguments_external)
+{
+ char const* sourceCode = R"(
+ (seq
+ (codecopy 0x00 (bytecodesize) 64)
+ (sstore 0x00 @0x00)
+ (sstore 0x01 @0x20)
+ (returnlll
+ (seq
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0xf2c9ecd8)
+ (return @@0x00))
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0x89ea642f)
+ (return @@0x01)))))
+ )";
+ compileAndRun(sourceCode, 0, "", encodeArgs(u256(65535), "test"));
+ BOOST_CHECK(callContractFunction("getNumber()") == encodeArgs(u256(65535)));
+ BOOST_CHECK(callContractFunction("getString()") == encodeArgs("test"));
+}
+
+BOOST_AUTO_TEST_CASE(fallback_and_invalid_function)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0xab5ed150)
+ (return "one"))
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0xee784123)
+ (return "two"))
+ (return "three")))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callContractFunction("getOne()") == encodeArgs("one"));
+ BOOST_CHECK(callContractFunction("getTwo()") == encodeArgs("two"));
+ BOOST_CHECK(callContractFunction("invalidFunction()") == encodeArgs("three"));
+ BOOST_CHECK(callFallback() == encodeArgs("three"));
+}
+
+BOOST_AUTO_TEST_CASE(lit_string)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (lit 0x00 "abcdef")
+ (return 0x00 0x20)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(string("abcdef")));
+}
+
+BOOST_AUTO_TEST_CASE(arithmetic)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (mstore8 0x00 (+ 160 22))
+ (mstore8 0x01 (- 223 41))
+ (mstore8 0x02 (* 33 2))
+ (mstore8 0x03 (/ 10 2))
+ (mstore8 0x04 (% 67 2))
+ (mstore8 0x05 (& 15 8))
+ (mstore8 0x06 (| 18 8))
+ (mstore8 0x07 (^ 26 6))
+ (return 0x00 0x20)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(
+ fromHex("b6b6420501081a1c000000000000000000000000000000000000000000000000")));
+}
+
+BOOST_AUTO_TEST_CASE(binary)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (mstore8 0x00 (< 53 87))
+ (mstore8 0x01 (< 73 42))
+ (mstore8 0x02 (<= 37 94))
+ (mstore8 0x03 (<= 37 37))
+ (mstore8 0x04 (<= 183 34))
+ (mstore8 0x05 (S< (- 0 53) 87))
+ (mstore8 0x06 (S< 73 (- 0 42)))
+ (mstore8 0x07 (S<= (- 0 37) 94))
+ (mstore8 0x08 (S<= (- 0 37) (- 0 37)))
+ (mstore8 0x09 (S<= 183 (- 0 34)))
+ (mstore8 0x0a (> 73 42))
+ (mstore8 0x0b (> 53 87))
+ (mstore8 0x0c (>= 94 37))
+ (mstore8 0x0d (>= 94 94))
+ (mstore8 0x0e (>= 34 183))
+ (mstore8 0x0f (S> 73 (- 0 42)))
+ (mstore8 0x10 (S> (- 0 53) 87))
+ (mstore8 0x11 (S>= 94 (- 0 37)))
+ (mstore8 0x12 (S>= (- 0 94) (- 0 94)))
+ (mstore8 0x13 (S>= (- 0 34) 183))
+ (mstore8 0x14 (= 53 53))
+ (mstore8 0x15 (= 73 42))
+ (mstore8 0x16 (!= 37 94))
+ (mstore8 0x17 (!= 37 37))
+ (return 0x00 0x20)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(
+ fromHex("0100010100010001010001000101000100010100010001000000000000000000")));
+}
+
+BOOST_AUTO_TEST_CASE(unary)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (mstore8 0x00 (! (< 53 87)))
+ (mstore8 0x01 (! (>= 42 73)))
+ (mstore8 0x02 (~ 0x7f))
+ (mstore8 0x03 (~ 0xaa))
+ (return 0x00 0x20)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(
+ fromHex("0001805500000000000000000000000000000000000000000000000000000000")));
+}
+
+BOOST_AUTO_TEST_CASE(assembly_mload_mstore)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (asm
+ 0x07 0x00 mstore
+ "abcdef" 0x20 mstore
+ 0x00 mload 0x40 mstore
+ 0x20 mload 0x60 mstore
+ 0x40 0x40 return))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(u256(7), string("abcdef")));
+}
+
+BOOST_AUTO_TEST_CASE(assembly_sload_sstore)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (asm
+ 0x07 0x00 sstore
+ "abcdef" 0x01 sstore
+ 0x00 sload 0x00 mstore
+ 0x01 sload 0x20 mstore
+ 0x40 0x00 return))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(u256(7), string("abcdef")));
+}
+
+BOOST_AUTO_TEST_CASE(assembly_codecopy)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (lit 0x00 "abcdef")
+ (asm
+ 0x06 0x16 0x20 codecopy
+ 0x20 0x20 return)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(string("abcdef")));
+}
+
BOOST_AUTO_TEST_SUITE_END()
}
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 11c38114..a4e601f7 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -26,6 +26,7 @@
#include <libsolidity/parsing/Scanner.h>
#include <libsolidity/parsing/Parser.h>
#include <libsolidity/analysis/NameAndTypeResolver.h>
+#include <libsolidity/analysis/StaticAnalyzer.h>
#include <libsolidity/analysis/SyntaxChecker.h>
#include <libsolidity/interface/Exceptions.h>
#include <libsolidity/analysis/GlobalContext.h>
@@ -89,8 +90,12 @@ parseAnalyseAndReturnError(string const& _source, bool _reportWarnings = false,
TypeChecker typeChecker(errors);
bool success = typeChecker.checkTypeRequirements(*contract);
BOOST_CHECK(success || !errors.empty());
-
}
+ if (success)
+ {
+ StaticAnalyzer staticAnalyzer(errors);
+ staticAnalyzer.analyze(*sourceUnit);
+ }
if (errors.size() > 1 && !_allowMultipleErrors)
BOOST_FAIL("Multiple errors found");
for (auto const& currentError: errors)
@@ -189,6 +194,14 @@ CHECK_ERROR_OR_WARNING(text, Warning, substring, true, false)
// [checkSuccess(text)] asserts that the compilation down to typechecking succeeds.
#define CHECK_SUCCESS(text) do { BOOST_CHECK(success((text))); } while(0)
+#define CHECK_SUCCESS_NO_WARNINGS(text) \
+do \
+{ \
+ auto sourceAndError = parseAnalyseAndReturnError((text), true); \
+ BOOST_CHECK(sourceAndError.second == nullptr); \
+} \
+while(0)
+
BOOST_AUTO_TEST_SUITE(SolidityNameAndTypeResolution)
@@ -4777,6 +4790,81 @@ BOOST_AUTO_TEST_CASE(invalid_mobile_type)
CHECK_ERROR(text, TypeError, "");
}
+BOOST_AUTO_TEST_CASE(warns_msg_value_in_non_payable_public_function)
+{
+ char const* text = R"(
+ contract C {
+ function f() {
+ msg.value;
+ }
+ }
+ )";
+ CHECK_WARNING(text, "\"msg.value\" used in non-payable function. Do you want to add the \"payable\" modifier to this function?");
+}
+
+BOOST_AUTO_TEST_CASE(does_not_warn_msg_value_in_payable_function)
+{
+ char const* text = R"(
+ contract C {
+ function f() payable {
+ msg.value;
+ }
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+}
+
+BOOST_AUTO_TEST_CASE(does_not_warn_msg_value_in_internal_function)
+{
+ char const* text = R"(
+ contract C {
+ function f() internal {
+ msg.value;
+ }
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+}
+
+BOOST_AUTO_TEST_CASE(does_not_warn_msg_value_in_library)
+{
+ char const* text = R"(
+ library C {
+ function f() {
+ msg.value;
+ }
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+}
+
+BOOST_AUTO_TEST_CASE(does_not_warn_non_magic_msg_value)
+{
+ char const* text = R"(
+ contract C {
+ struct msg {
+ uint256 value;
+ }
+
+ function f() {
+ msg.value;
+ }
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+}
+
+BOOST_AUTO_TEST_CASE(does_not_warn_msg_value_in_modifier_following_non_payable_public_function)
+{
+ char const* text = R"(
+ contract c {
+ function f() { }
+ modifier m() { msg.value; _; }
+ }
+ )";
+ CHECK_SUCCESS_NO_WARNINGS(text);
+}
+
BOOST_AUTO_TEST_SUITE_END()
}