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

style fixes in test/libsolidity/solidityExecutionFramework.h

Browse Source 
fixed the test
This commit is contained in:
Liana Husikyan 2015-05-29 15:39:42 +02:00
parent ca8104397d
commit 47f0e847e5
2 changed files with 141 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/SolidityEndToEndTest.cpp
View File

@ -4169,9 +4169,7 @@ BOOST_AUTO_TEST_CASE(evm_exceptions_in_constructor_out_of_baund)
} }
} }
)"; )";
compileAndRun(sourceCode, 0, "A"); BOOST_CHECK(execute(sourceCode, 0, "A").empty());
//BOOST_CHECK(m_output.empty()); todo
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()

263
libsolidity/solidityExecutionFramework.h
View File

@ -40,142 +40,159 @@ namespace test
class ExecutionFramework class ExecutionFramework
{ {
public: public:
ExecutionFramework() { g_logVerbosity = 0; } ExecutionFramework() { g_logVerbosity = 0; }
bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "") bytes const& execute(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "")
{ {
m_compiler.reset(false, m_addStandardSources); m_compiler.reset(false, m_addStandardSources);
m_compiler.addSource("", _sourceCode); m_compiler.addSource("", _sourceCode);
ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize), "Compiling contract failed"); ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize), "Compiling contract failed");
bytes code = m_compiler.getBytecode(_contractName); bytes code = m_compiler.getBytecode(_contractName);
sendMessage(code, true, _value); sendMessage(code, true, _value);
BOOST_REQUIRE(!m_output.empty()); return m_output;
return m_output; }
}
template <class... Args> bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "")
bytes const& callContractFunctionWithValue(std::string _sig, u256 const& _value, {
Args const&... _arguments) execute(_sourceCode, _value, _contractName);
{ BOOST_REQUIRE(!m_output.empty());
FixedHash<4> hash(dev::sha3(_sig)); return m_output;
sendMessage(hash.asBytes() + encodeArgs(_arguments...), false, _value); }
return m_output;
}
template <class... Args> template <class... Args>
bytes const& callContractFunction(std::string _sig, Args const&... _arguments) bytes const& callContractFunctionWithValue(std::string _sig, u256 const& _value, Args const&... _arguments)
{ {
return callContractFunctionWithValue(_sig, 0, _arguments...); FixedHash<4> hash(dev::sha3(_sig));
} sendMessage(hash.asBytes() + encodeArgs(_arguments...), false, _value);
return m_output;
}
template <class CppFunction, class... Args> template <class... Args>
void testSolidityAgainstCpp(std::string _sig, CppFunction const& _cppFunction, Args const&... _arguments) bytes const& callContractFunction(std::string _sig, Args const&... _arguments)
{ {
bytes solidityResult = callContractFunction(_sig, _arguments...); return callContractFunctionWithValue(_sig, 0, _arguments...);
bytes cppResult = callCppAndEncodeResult(_cppFunction, _arguments...); }
BOOST_CHECK_MESSAGE(solidityResult == cppResult, "Computed values do not match."
"\nSolidity: " + toHex(solidityResult) + "\nC++: " + toHex(cppResult));
}
template <class CppFunction, class... Args> template <class CppFunction, class... Args>
void testSolidityAgainstCppOnRange(std::string _sig, CppFunction const& _cppFunction, void testSolidityAgainstCpp(std::string _sig, CppFunction const& _cppFunction, Args const&... _arguments)
u256 const& _rangeStart, u256 const& _rangeEnd) {
{ bytes solidityResult = callContractFunction(_sig, _arguments...);
for (u256 argument = _rangeStart; argument < _rangeEnd; ++argument) bytes cppResult = callCppAndEncodeResult(_cppFunction, _arguments...);
{ BOOST_CHECK_MESSAGE(
bytes solidityResult = callContractFunction(_sig, argument); solidityResult == cppResult, "Computed values do not match.\nSolidity: " + toHex(solidityResult) + "\nC++: " + toHex(cppResult));
bytes cppResult = callCppAndEncodeResult(_cppFunction, argument); }
BOOST_CHECK_MESSAGE(solidityResult == cppResult, "Computed values do not match."
"\nSolidity: " + toHex(solidityResult) + "\nC++: " + toHex(cppResult) +
"\nArgument: " + toHex(encode(argument)));
}
}
static bytes encode(bool _value) { return encode(byte(_value)); } template <class CppFunction, class... Args>
static bytes encode(int _value) { return encode(u256(_value)); } void testSolidityAgainstCppOnRange(
static bytes encode(char const* _value) { return encode(std::string(_value)); } std::string _sig,
static bytes encode(byte _value) { return bytes(31, 0) + bytes{_value}; } CppFunction const& _cppFunction,
static bytes encode(u256 const& _value) { return toBigEndian(_value); } u256 const& _rangeStart,
static bytes encode(h256 const& _value) { return _value.asBytes(); } u256 const& _rangeEnd
static bytes encode(bytes const& _value, bool _padLeft = true) )
{ {
bytes padding = bytes((32 - _value.size() % 32) % 32, 0); for (u256 argument = _rangeStart; argument < _rangeEnd; ++argument)
return _padLeft ? padding + _value : _value + padding; {
} bytes solidityResult = callContractFunction(_sig, argument);
static bytes encode(std::string const& _value) { return encode(asBytes(_value), false); } bytes cppResult = callCppAndEncodeResult(_cppFunction, argument);
BOOST_CHECK_MESSAGE(
solidityResult == cppResult,
"Computed values do not match.\nSolidity: " +
toHex(solidityResult) +
"\nC++: " +
toHex(cppResult) +
"\nArgument: " +
toHex(encode(argument))
);
}
}
template <class FirstArg, class... Args> static bytes encode(bool _value) { return encode(byte(_value)); }
static bytes encodeArgs(FirstArg const& _firstArg, Args const&... _followingArgs) static bytes encode(int _value) { return encode(u256(_value)); }
{ static bytes encode(char const* _value) { return encode(std::string(_value)); }
return encode(_firstArg) + encodeArgs(_followingArgs...); static bytes encode(byte _value) { return bytes(31, 0) + bytes{_value}; }
} static bytes encode(u256 const& _value) { return toBigEndian(_value); }
static bytes encodeArgs() static bytes encode(h256 const& _value) { return _value.asBytes(); }
{ static bytes encode(bytes const& _value, bool _padLeft = true)
return bytes(); {
} bytes padding = bytes((32 - _value.size() % 32) % 32, 0);
return _padLeft ? padding + _value : _value + padding;
}
static bytes encode(std::string const& _value) { return encode(asBytes(_value), false); }
template <class FirstArg, class... Args>
static bytes encodeArgs(FirstArg const& _firstArg, Args const&... _followingArgs)
{
return encode(_firstArg) + encodeArgs(_followingArgs...);
}
static bytes encodeArgs()
{
return bytes();
}
private: private:
template <class CppFunction, class... Args> template <class CppFunction, class... Args>
auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments) auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
-> typename std::enable_if<std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type -> typename std::enable_if<std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
{ {
_cppFunction(_arguments...); _cppFunction(_arguments...);
return bytes(); return bytes();
} }
template <class CppFunction, class... Args> template <class CppFunction, class... Args>
auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments) auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
-> typename std::enable_if<!std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type -> typename std::enable_if<!std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
{ {
return encode(_cppFunction(_arguments...)); return encode(_cppFunction(_arguments...));
} }
protected: protected:
void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0) void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0)
{ {
m_state.addBalance(m_sender, _value); // just in case m_state.addBalance(m_sender, _value); // just in case
eth::Executive executive(m_state, eth::LastHashes(), 0); eth::Executive executive(m_state, eth::LastHashes(), 0);
eth::Transaction t = _isCreation ? eth::Transaction(_value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec()) eth::Transaction t = _isCreation ? eth::Transaction(
: eth::Transaction(_value, m_gasPrice, m_gas, m_contractAddress, _data, 0, KeyPair::create().sec()); _value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec()
bytes transactionRLP = t.rlp(); ) : eth::Transaction(_value, m_gasPrice, m_gas, m_contractAddress, _data, 0, KeyPair::create().sec());
try
{
// this will throw since the transaction is invalid, but it should nevertheless store the transaction
executive.initialize(&transactionRLP);
executive.execute();
}
catch (...) {}
if (_isCreation)
{
BOOST_REQUIRE(!executive.create(m_sender, _value, m_gasPrice, m_gas, &_data, m_sender));
m_contractAddress = executive.newAddress();
BOOST_REQUIRE(m_contractAddress);
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
}
else
{
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
BOOST_REQUIRE(!executive.call(m_contractAddress, m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas, m_sender));
}
BOOST_REQUIRE(executive.go());
m_state.noteSending(m_sender);
executive.finalize();
m_gasUsed = executive.gasUsed();
m_output = executive.out().toVector();
m_logs = executive.logs();
}
bool m_optimize = false; bytes transactionRLP = t.rlp();
bool m_addStandardSources = false; try
dev::solidity::CompilerStack m_compiler; {
Address m_sender; // this will throw since the transaction is invalid, but it should nevertheless store the transaction
Address m_contractAddress; executive.initialize(&transactionRLP);
eth::State m_state; executive.execute();
u256 const m_gasPrice = 100 * eth::szabo; }
u256 const m_gas = 100000000; catch (...) {}
bytes m_output; if (_isCreation)
eth::LogEntries m_logs; {
u256 m_gasUsed; BOOST_REQUIRE(!executive.create(m_sender, _value, m_gasPrice, m_gas, &_data, m_sender));
m_contractAddress = executive.newAddress();
BOOST_REQUIRE(m_contractAddress);
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
}
else
{
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
BOOST_REQUIRE(!executive.call(m_contractAddress, m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas, m_sender));
}
BOOST_REQUIRE(executive.go());
m_state.noteSending(m_sender);
executive.finalize();
m_gasUsed = executive.gasUsed();
m_output = executive.out().toVector();
m_logs = executive.logs();
}
bool m_optimize = false;
bool m_addStandardSources = false;
dev::solidity::CompilerStack m_compiler;
Address m_sender;
Address m_contractAddress;
eth::State m_state;
u256 const m_gasPrice = 100 * eth::szabo;
u256 const m_gas = 100000000;
bytes m_output;
eth::LogEntries m_logs;
u256 m_gasUsed;
}; };
} }