aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2016-11-28 08:21:01 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2016-11-30 05:54:27 +0800
commita226db73384ac1b588e07a28dd8f1ff92cbdf6f7 (patch)
tree67ea757fe4786f70d6343234f1c8dc86de7059f4 /test
parent4af30cc5183d83afd8a112bbc29e5c7beb3b7c1a (diff)
downloaddexon-solidity-a226db73384ac1b588e07a28dd8f1ff92cbdf6f7.tar.gz
dexon-solidity-a226db73384ac1b588e07a28dd8f1ff92cbdf6f7.tar.zst
dexon-solidity-a226db73384ac1b588e07a28dd8f1ff92cbdf6f7.zip
Split out Solidity-specific part of ExecutionFramework
Diffstat (limited to 'test')
-rw-r--r--test/ExecutionFramework.cpp137
-rw-r--r--test/ExecutionFramework.h288
-rw-r--r--test/contracts/AuctionRegistrar.cpp6
-rw-r--r--test/contracts/FixedFeeRegistrar.cpp2
-rw-r--r--test/contracts/Wallet.cpp2
-rw-r--r--test/libsolidity/GasMeter.cpp2
-rw-r--r--test/libsolidity/SolidityEndToEndTest.cpp3
-rw-r--r--test/libsolidity/SolidityExecutionFramework.cpp106
-rw-r--r--test/libsolidity/SolidityExecutionFramework.h242
-rw-r--r--test/libsolidity/SolidityOptimizer.cpp2
10 files changed, 441 insertions, 349 deletions
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
new file mode 100644
index 00000000..4ae50462
--- /dev/null
+++ b/test/ExecutionFramework.cpp
@@ -0,0 +1,137 @@
+/*
+ This file is part of solidity.
+
+ solidity is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ solidity is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with solidity. If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @author Christian <c@ethdev.com>
+ * @date 2016
+ * Framework for executing contracts and testing them using RPC.
+ */
+
+#include <cstdlib>
+#include <boost/test/framework.hpp>
+#include <libdevcore/CommonIO.h>
+#include <test/ExecutionFramework.h>
+
+using namespace std;
+using namespace dev;
+using namespace dev::solidity;
+using namespace dev::solidity::test;
+
+namespace // anonymous
+{
+ h256 const EmptyTrie("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421");
+}
+
+string getIPCSocketPath()
+{
+ string ipcPath = dev::test::Options::get().ipcPath;
+ if (ipcPath.empty())
+ BOOST_FAIL("ERROR: ipcPath not set! (use --ipcpath <path> or the environment variable ETH_TEST_IPC)");
+
+ return ipcPath;
+}
+
+ExecutionFramework::ExecutionFramework() :
+ m_rpc(RPCSession::instance(getIPCSocketPath())),
+ m_optimize(dev::test::Options::get().optimize),
+ m_sender(m_rpc.account(0))
+{
+ m_rpc.test_rewindToBlock(0);
+}
+
+void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256 const& _value)
+{
+ RPCSession::TransactionData d;
+ d.data = "0x" + toHex(_data);
+ d.from = "0x" + toString(m_sender);
+ d.gas = toHex(m_gas, HexPrefix::Add);
+ d.gasPrice = toHex(m_gasPrice, HexPrefix::Add);
+ d.value = toHex(_value, HexPrefix::Add);
+ if (!_isCreation)
+ {
+ d.to = dev::toString(m_contractAddress);
+ BOOST_REQUIRE(m_rpc.eth_getCode(d.to, "latest").size() > 2);
+ // Use eth_call to get the output
+ m_output = fromHex(m_rpc.eth_call(d, "latest"), WhenError::Throw);
+ }
+
+ string txHash = m_rpc.eth_sendTransaction(d);
+ m_rpc.test_mineBlocks(1);
+ RPCSession::TransactionReceipt receipt(m_rpc.eth_getTransactionReceipt(txHash));
+
+ if (_isCreation)
+ {
+ m_contractAddress = Address(receipt.contractAddress);
+ BOOST_REQUIRE(m_contractAddress);
+ string code = m_rpc.eth_getCode(receipt.contractAddress, "latest");
+ m_output = fromHex(code, WhenError::Throw);
+ }
+
+ m_gasUsed = u256(receipt.gasUsed);
+ m_logs.clear();
+ for (auto const& log: receipt.logEntries)
+ {
+ LogEntry entry;
+ entry.address = Address(log.address);
+ for (auto const& topic: log.topics)
+ entry.topics.push_back(h256(topic));
+ entry.data = fromHex(log.data, WhenError::Throw);
+ m_logs.push_back(entry);
+ }
+}
+
+void ExecutionFramework::sendEther(Address const& _to, u256 const& _value)
+{
+ RPCSession::TransactionData d;
+ d.data = "0x";
+ d.from = "0x" + toString(m_sender);
+ d.gas = toHex(m_gas, HexPrefix::Add);
+ d.gasPrice = toHex(m_gasPrice, HexPrefix::Add);
+ d.value = toHex(_value, HexPrefix::Add);
+ d.to = dev::toString(_to);
+
+ string txHash = m_rpc.eth_sendTransaction(d);
+ m_rpc.test_mineBlocks(1);
+}
+
+size_t ExecutionFramework::currentTimestamp()
+{
+ auto latestBlock = m_rpc.rpcCall("eth_getBlockByNumber", {"\"latest\"", "false"});
+ return size_t(u256(latestBlock.get("timestamp", "invalid").asString()));
+}
+
+Address ExecutionFramework::account(size_t _i)
+{
+ return Address(m_rpc.accountCreateIfNotExists(_i));
+}
+
+bool ExecutionFramework::addressHasCode(Address const& _addr)
+{
+ string code = m_rpc.eth_getCode(toString(_addr), "latest");
+ return !code.empty() && code != "0x";
+}
+
+u256 ExecutionFramework::balanceAt(Address const& _addr)
+{
+ return u256(m_rpc.eth_getBalance(toString(_addr), "latest"));
+}
+
+bool ExecutionFramework::storageEmpty(Address const& _addr)
+{
+ h256 root(m_rpc.eth_getStorageRoot(toString(_addr), "latest"));
+ BOOST_CHECK(root);
+ return root == EmptyTrie;
+}
diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h
new file mode 100644
index 00000000..e487b106
--- /dev/null
+++ b/test/ExecutionFramework.h
@@ -0,0 +1,288 @@
+/*
+ This file is part of solidity.
+
+ solidity is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ solidity is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with solidity. If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @author Christian <c@ethdev.com>
+ * @date 2014
+ * Framework for executing contracts and testing them using RPC.
+ */
+
+#pragma once
+
+#include <functional>
+
+#include "TestHelper.h"
+#include "RPCSession.h"
+
+#include <libdevcore/ABI.h>
+#include <libdevcore/FixedHash.h>
+
+namespace dev
+{
+namespace solidity
+{
+ using rational = boost::rational<dev::bigint>;
+ /// An Ethereum address: 20 bytes.
+ /// @NOTE This is not endian-specific; it's just a bunch of bytes.
+ using Address = h160;
+
+ // The various denominations; here for ease of use where needed within code.
+ static const u256 ether = exp10<18>();
+ static const u256 finney = exp10<15>();
+ static const u256 szabo = exp10<12>();
+ static const u256 shannon = exp10<9>();
+ static const u256 wei = exp10<0>();
+
+namespace test
+{
+
+class ExecutionFramework
+{
+
+public:
+ ExecutionFramework();
+
+ virtual bytes const& compileAndRunWithoutCheck(
+ std::string const& _sourceCode,
+ u256 const& _value = 0,
+ std::string const& _contractName = "",
+ bytes const& _arguments = bytes(),
+ std::map<std::string, Address> const& _libraryAddresses = std::map<std::string, Address>()
+ ) = 0;
+
+ bytes const& compileAndRun(
+ std::string const& _sourceCode,
+ u256 const& _value = 0,
+ std::string const& _contractName = "",
+ bytes const& _arguments = bytes(),
+ std::map<std::string, Address> const& _libraryAddresses = std::map<std::string, Address>()
+ )
+ {
+ compileAndRunWithoutCheck(_sourceCode, _value, _contractName, _arguments, _libraryAddresses);
+ BOOST_REQUIRE(!m_output.empty());
+ return m_output;
+ }
+
+ template <class... Args>
+ bytes const& callContractFunctionWithValue(std::string _sig, u256 const& _value, Args const&... _arguments)
+ {
+ FixedHash<4> hash(dev::keccak256(_sig));
+ sendMessage(hash.asBytes() + encodeArgs(_arguments...), false, _value);
+ return m_output;
+ }
+
+ template <class... Args>
+ bytes const& callContractFunction(std::string _sig, Args const&... _arguments)
+ {
+ return callContractFunctionWithValue(_sig, 0, _arguments...);
+ }
+
+ template <class CppFunction, class... Args>
+ void testSolidityAgainstCpp(std::string _sig, CppFunction const& _cppFunction, Args const&... _arguments)
+ {
+ bytes solidityResult = callContractFunction(_sig, _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>
+ void testSolidityAgainstCppOnRange(std::string _sig, CppFunction const& _cppFunction, u256 const& _rangeStart, u256 const& _rangeEnd)
+ {
+ for (u256 argument = _rangeStart; argument < _rangeEnd; ++argument)
+ {
+ bytes solidityResult = callContractFunction(_sig, argument);
+ 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)); }
+ static bytes encode(int _value) { return encode(u256(_value)); }
+ static bytes encode(size_t _value) { return encode(u256(_value)); }
+ static bytes encode(char const* _value) { return encode(std::string(_value)); }
+ static bytes encode(byte _value) { return bytes(31, 0) + bytes{_value}; }
+ static bytes encode(u256 const& _value) { return toBigEndian(_value); }
+ /// @returns the fixed-point encoding of a rational number with a given
+ /// number of fractional bits.
+ static bytes encode(std::pair<rational, int> const& _valueAndPrecision)
+ {
+ rational const& value = _valueAndPrecision.first;
+ int fractionalBits = _valueAndPrecision.second;
+ return encode(u256((value.numerator() << fractionalBits) / value.denominator()));
+ }
+ static bytes encode(h256 const& _value) { return _value.asBytes(); }
+ static bytes encode(bytes const& _value, bool _padLeft = true)
+ {
+ 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 _T>
+ static bytes encode(std::vector<_T> const& _value)
+ {
+ bytes ret;
+ for (auto const& v: _value)
+ ret += encode(v);
+ return ret;
+ }
+
+ template <class FirstArg, class... Args>
+ static bytes encodeArgs(FirstArg const& _firstArg, Args const&... _followingArgs)
+ {
+ return encode(_firstArg) + encodeArgs(_followingArgs...);
+ }
+ static bytes encodeArgs()
+ {
+ return bytes();
+ }
+ //@todo might be extended in the future
+ template <class Arg>
+ static bytes encodeDyn(Arg const& _arg)
+ {
+ return encodeArgs(u256(0x20), u256(_arg.size()), _arg);
+ }
+ class ContractInterface
+ {
+ public:
+ ContractInterface(ExecutionFramework& _framework): m_framework(_framework) {}
+
+ void setNextValue(u256 const& _value) { m_nextValue = _value; }
+
+ protected:
+ template <class... Args>
+ bytes const& call(std::string const& _sig, Args const&... _arguments)
+ {
+ auto const& ret = m_framework.callContractFunctionWithValue(_sig, m_nextValue, _arguments...);
+ m_nextValue = 0;
+ return ret;
+ }
+
+ void callString(std::string const& _name, std::string const& _arg)
+ {
+ BOOST_CHECK(call(_name + "(string)", u256(0x20), _arg.length(), _arg).empty());
+ }
+
+ void callStringAddress(std::string const& _name, std::string const& _arg1, u160 const& _arg2)
+ {
+ BOOST_CHECK(call(_name + "(string,address)", u256(0x40), _arg2, _arg1.length(), _arg1).empty());
+ }
+
+ void callStringAddressBool(std::string const& _name, std::string const& _arg1, u160 const& _arg2, bool _arg3)
+ {
+ BOOST_CHECK(call(_name + "(string,address,bool)", u256(0x60), _arg2, _arg3, _arg1.length(), _arg1).empty());
+ }
+
+ void callStringBytes32(std::string const& _name, std::string const& _arg1, h256 const& _arg2)
+ {
+ BOOST_CHECK(call(_name + "(string,bytes32)", u256(0x40), _arg2, _arg1.length(), _arg1).empty());
+ }
+
+ u160 callStringReturnsAddress(std::string const& _name, std::string const& _arg)
+ {
+ bytes const& ret = call(_name + "(string)", u256(0x20), _arg.length(), _arg);
+ BOOST_REQUIRE(ret.size() == 0x20);
+ BOOST_CHECK(std::count(ret.begin(), ret.begin() + 12, 0) == 12);
+ return eth::abiOut<u160>(ret);
+ }
+
+ std::string callAddressReturnsString(std::string const& _name, u160 const& _arg)
+ {
+ bytesConstRef ret = ref(call(_name + "(address)", _arg));
+ BOOST_REQUIRE(ret.size() >= 0x20);
+ u256 offset = eth::abiOut<u256>(ret);
+ BOOST_REQUIRE_EQUAL(offset, 0x20);
+ u256 len = eth::abiOut<u256>(ret);
+ BOOST_REQUIRE_EQUAL(ret.size(), ((len + 0x1f) / 0x20) * 0x20);
+ return ret.cropped(0, size_t(len)).toString();
+ }
+
+ h256 callStringReturnsBytes32(std::string const& _name, std::string const& _arg)
+ {
+ bytes const& ret = call(_name + "(string)", u256(0x20), _arg.length(), _arg);
+ BOOST_REQUIRE(ret.size() == 0x20);
+ return eth::abiOut<h256>(ret);
+ }
+
+ private:
+ u256 m_nextValue;
+ ExecutionFramework& m_framework;
+ };
+
+private:
+ template <class CppFunction, class... Args>
+ auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
+ -> typename std::enable_if<std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
+ {
+ _cppFunction(_arguments...);
+ return bytes();
+ }
+ template <class CppFunction, class... Args>
+ auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
+ -> typename std::enable_if<!std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
+ {
+ return encode(_cppFunction(_arguments...));
+ }
+
+protected:
+ void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0);
+ void sendEther(Address const& _to, u256 const& _value);
+ size_t currentTimestamp();
+
+ /// @returns the (potentially newly created) _ith address.
+ Address account(size_t _i);
+
+ u256 balanceAt(Address const& _addr);
+ bool storageEmpty(Address const& _addr);
+ bool addressHasCode(Address const& _addr);
+
+ RPCSession& m_rpc;
+
+ struct LogEntry
+ {
+ Address address;
+ std::vector<h256> topics;
+ bytes data;
+ };
+
+ size_t m_optimizeRuns = 200;
+ bool m_optimize = false;
+ Address m_sender;
+ Address m_contractAddress;
+ u256 const m_gasPrice = 100 * szabo;
+ u256 const m_gas = 100000000;
+ bytes m_output;
+ std::vector<LogEntry> m_logs;
+ u256 m_gasUsed;
+};
+
+}
+}
+} // end namespaces
+
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp
index 0b573bca..c156efd1 100644
--- a/test/contracts/AuctionRegistrar.cpp
+++ b/test/contracts/AuctionRegistrar.cpp
@@ -213,7 +213,7 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
static unique_ptr<bytes> s_compiledRegistrar;
-class AuctionRegistrarTestFramework: public ExecutionFramework
+class AuctionRegistrarTestFramework: public SolidityExecutionFramework
{
protected:
void deployRegistrar()
@@ -229,11 +229,11 @@ protected:
BOOST_REQUIRE(!m_output.empty());
}
- using ContractInterface = ExecutionFramework::ContractInterface;
+ using ContractInterface = SolidityExecutionFramework::ContractInterface;
class RegistrarInterface: public ContractInterface
{
public:
- RegistrarInterface(ExecutionFramework& _framework): ContractInterface(_framework) {}
+ RegistrarInterface(SolidityExecutionFramework& _framework): ContractInterface(_framework) {}
void reserve(string const& _name)
{
callString("reserve", _name);
diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp
index 8aabdac2..829205d5 100644
--- a/test/contracts/FixedFeeRegistrar.cpp
+++ b/test/contracts/FixedFeeRegistrar.cpp
@@ -125,7 +125,7 @@ contract FixedFeeRegistrar is Registrar {
static unique_ptr<bytes> s_compiledRegistrar;
-class RegistrarTestFramework: public ExecutionFramework
+class RegistrarTestFramework: public SolidityExecutionFramework
{
protected:
void deployRegistrar()
diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
index 935baf5b..6fbee6f1 100644
--- a/test/contracts/Wallet.cpp
+++ b/test/contracts/Wallet.cpp
@@ -435,7 +435,7 @@ contract Wallet is multisig, multiowned, daylimit {
static unique_ptr<bytes> s_compiledWallet;
-class WalletTestFramework: public ExecutionFramework
+class WalletTestFramework: public SolidityExecutionFramework
{
protected:
void deployWallet(
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index bc224284..f467d669 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -40,7 +40,7 @@ namespace solidity
namespace test
{
-class GasMeterTestFramework: public ExecutionFramework
+class GasMeterTestFramework: public SolidityExecutionFramework
{
public:
GasMeterTestFramework() { }
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 6478ea86..b5fcdb5e 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -25,6 +25,7 @@
#include <string>
#include <tuple>
#include <boost/test/unit_test.hpp>
+#include <libevmasm/Assembly.h>
#include <libsolidity/interface/Exceptions.h>
#include <test/libsolidity/SolidityExecutionFramework.h>
@@ -38,7 +39,7 @@ namespace solidity
namespace test
{
-BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, ExecutionFramework)
+BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, SolidityExecutionFramework)
BOOST_AUTO_TEST_CASE(smoke_test)
{
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index 00943367..fe35087c 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -22,7 +22,6 @@
#include <cstdlib>
#include <boost/test/framework.hpp>
-#include <libdevcore/CommonIO.h>
#include <test/libsolidity/SolidityExecutionFramework.h>
using namespace std;
@@ -30,108 +29,7 @@ using namespace dev;
using namespace dev::solidity;
using namespace dev::solidity::test;
-namespace // anonymous
+SolidityExecutionFramework::SolidityExecutionFramework() :
+ ExecutionFramework()
{
- h256 const EmptyTrie("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421");
-}
-
-string getIPCSocketPath()
-{
- string ipcPath = dev::test::Options::get().ipcPath;
- if (ipcPath.empty())
- BOOST_FAIL("ERROR: ipcPath not set! (use --ipcpath <path> or the environment variable ETH_TEST_IPC)");
-
- return ipcPath;
-}
-
-ExecutionFramework::ExecutionFramework() :
- m_rpc(RPCSession::instance(getIPCSocketPath())),
- m_optimize(dev::test::Options::get().optimize),
- m_sender(m_rpc.account(0))
-{
- m_rpc.test_rewindToBlock(0);
-}
-
-void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256 const& _value)
-{
- RPCSession::TransactionData d;
- d.data = "0x" + toHex(_data);
- d.from = "0x" + toString(m_sender);
- d.gas = toHex(m_gas, HexPrefix::Add);
- d.gasPrice = toHex(m_gasPrice, HexPrefix::Add);
- d.value = toHex(_value, HexPrefix::Add);
- if (!_isCreation)
- {
- d.to = dev::toString(m_contractAddress);
- BOOST_REQUIRE(m_rpc.eth_getCode(d.to, "latest").size() > 2);
- // Use eth_call to get the output
- m_output = fromHex(m_rpc.eth_call(d, "latest"), WhenError::Throw);
- }
-
- string txHash = m_rpc.eth_sendTransaction(d);
- m_rpc.test_mineBlocks(1);
- RPCSession::TransactionReceipt receipt(m_rpc.eth_getTransactionReceipt(txHash));
-
- if (_isCreation)
- {
- m_contractAddress = Address(receipt.contractAddress);
- BOOST_REQUIRE(m_contractAddress);
- string code = m_rpc.eth_getCode(receipt.contractAddress, "latest");
- m_output = fromHex(code, WhenError::Throw);
- }
-
- m_gasUsed = u256(receipt.gasUsed);
- m_logs.clear();
- for (auto const& log: receipt.logEntries)
- {
- LogEntry entry;
- entry.address = Address(log.address);
- for (auto const& topic: log.topics)
- entry.topics.push_back(h256(topic));
- entry.data = fromHex(log.data, WhenError::Throw);
- m_logs.push_back(entry);
- }
-}
-
-void ExecutionFramework::sendEther(Address const& _to, u256 const& _value)
-{
- RPCSession::TransactionData d;
- d.data = "0x";
- d.from = "0x" + toString(m_sender);
- d.gas = toHex(m_gas, HexPrefix::Add);
- d.gasPrice = toHex(m_gasPrice, HexPrefix::Add);
- d.value = toHex(_value, HexPrefix::Add);
- d.to = dev::toString(_to);
-
- string txHash = m_rpc.eth_sendTransaction(d);
- m_rpc.test_mineBlocks(1);
-}
-
-size_t ExecutionFramework::currentTimestamp()
-{
- auto latestBlock = m_rpc.rpcCall("eth_getBlockByNumber", {"\"latest\"", "false"});
- return size_t(u256(latestBlock.get("timestamp", "invalid").asString()));
-}
-
-Address ExecutionFramework::account(size_t _i)
-{
- return Address(m_rpc.accountCreateIfNotExists(_i));
-}
-
-bool ExecutionFramework::addressHasCode(Address const& _addr)
-{
- string code = m_rpc.eth_getCode(toString(_addr), "latest");
- return !code.empty() && code != "0x";
-}
-
-u256 ExecutionFramework::balanceAt(Address const& _addr)
-{
- return u256(m_rpc.eth_getBalance(toString(_addr), "latest"));
-}
-
-bool ExecutionFramework::storageEmpty(Address const& _addr)
-{
- h256 root(m_rpc.eth_getStorageRoot(toString(_addr), "latest"));
- BOOST_CHECK(root);
- return root == EmptyTrie;
}
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
index b2ea9c08..16b886f1 100644
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ b/test/libsolidity/SolidityExecutionFramework.h
@@ -24,12 +24,7 @@
#include <functional>
-#include "../TestHelper.h"
-#include "../RPCSession.h"
-
-#include <libdevcore/ABI.h>
-#include <libdevcore/FixedHash.h>
-#include <libevmasm/Instruction.h>
+#include "../ExecutionFramework.h"
#include <libsolidity/interface/CompilerStack.h>
#include <libsolidity/interface/Exceptions.h>
@@ -39,34 +34,23 @@ namespace dev
{
namespace solidity
{
- using rational = boost::rational<dev::bigint>;
- /// An Ethereum address: 20 bytes.
- /// @NOTE This is not endian-specific; it's just a bunch of bytes.
- using Address = h160;
-
- // The various denominations; here for ease of use where needed within code.
- static const u256 ether = exp10<18>();
- static const u256 finney = exp10<15>();
- static const u256 szabo = exp10<12>();
- static const u256 shannon = exp10<9>();
- static const u256 wei = exp10<0>();
namespace test
{
-class ExecutionFramework
+class SolidityExecutionFramework: public ExecutionFramework
{
public:
- ExecutionFramework();
+ SolidityExecutionFramework();
- bytes const& compileAndRunWithoutCheck(
+ virtual bytes const& compileAndRunWithoutCheck(
std::string const& _sourceCode,
u256 const& _value = 0,
std::string const& _contractName = "",
bytes const& _arguments = bytes(),
std::map<std::string, Address> const& _libraryAddresses = std::map<std::string, Address>()
- )
+ ) override
{
// Silence compiler version warning
std::string sourceCode = "pragma solidity >=0.0;\n" + _sourceCode;
@@ -90,224 +74,8 @@ public:
return m_output;
}
- bytes const& compileAndRun(
- std::string const& _sourceCode,
- u256 const& _value = 0,
- std::string const& _contractName = "",
- bytes const& _arguments = bytes(),
- std::map<std::string, Address> const& _libraryAddresses = std::map<std::string, Address>()
- )
- {
- compileAndRunWithoutCheck(_sourceCode, _value, _contractName, _arguments, _libraryAddresses);
- BOOST_REQUIRE(!m_output.empty());
- return m_output;
- }
-
- template <class... Args>
- bytes const& callContractFunctionWithValue(std::string _sig, u256 const& _value, Args const&... _arguments)
- {
- FixedHash<4> hash(dev::keccak256(_sig));
- sendMessage(hash.asBytes() + encodeArgs(_arguments...), false, _value);
- return m_output;
- }
-
- template <class... Args>
- bytes const& callContractFunction(std::string _sig, Args const&... _arguments)
- {
- return callContractFunctionWithValue(_sig, 0, _arguments...);
- }
-
- template <class CppFunction, class... Args>
- void testSolidityAgainstCpp(std::string _sig, CppFunction const& _cppFunction, Args const&... _arguments)
- {
- bytes solidityResult = callContractFunction(_sig, _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>
- void testSolidityAgainstCppOnRange(std::string _sig, CppFunction const& _cppFunction, u256 const& _rangeStart, u256 const& _rangeEnd)
- {
- for (u256 argument = _rangeStart; argument < _rangeEnd; ++argument)
- {
- bytes solidityResult = callContractFunction(_sig, argument);
- 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)); }
- static bytes encode(int _value) { return encode(u256(_value)); }
- static bytes encode(size_t _value) { return encode(u256(_value)); }
- static bytes encode(char const* _value) { return encode(std::string(_value)); }
- static bytes encode(byte _value) { return bytes(31, 0) + bytes{_value}; }
- static bytes encode(u256 const& _value) { return toBigEndian(_value); }
- /// @returns the fixed-point encoding of a rational number with a given
- /// number of fractional bits.
- static bytes encode(std::pair<rational, int> const& _valueAndPrecision)
- {
- rational const& value = _valueAndPrecision.first;
- int fractionalBits = _valueAndPrecision.second;
- return encode(u256((value.numerator() << fractionalBits) / value.denominator()));
- }
- static bytes encode(h256 const& _value) { return _value.asBytes(); }
- static bytes encode(bytes const& _value, bool _padLeft = true)
- {
- 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 _T>
- static bytes encode(std::vector<_T> const& _value)
- {
- bytes ret;
- for (auto const& v: _value)
- ret += encode(v);
- return ret;
- }
-
- template <class FirstArg, class... Args>
- static bytes encodeArgs(FirstArg const& _firstArg, Args const&... _followingArgs)
- {
- return encode(_firstArg) + encodeArgs(_followingArgs...);
- }
- static bytes encodeArgs()
- {
- return bytes();
- }
- //@todo might be extended in the future
- template <class Arg>
- static bytes encodeDyn(Arg const& _arg)
- {
- return encodeArgs(u256(0x20), u256(_arg.size()), _arg);
- }
- class ContractInterface
- {
- public:
- ContractInterface(ExecutionFramework& _framework): m_framework(_framework) {}
-
- void setNextValue(u256 const& _value) { m_nextValue = _value; }
-
- protected:
- template <class... Args>
- bytes const& call(std::string const& _sig, Args const&... _arguments)
- {
- auto const& ret = m_framework.callContractFunctionWithValue(_sig, m_nextValue, _arguments...);
- m_nextValue = 0;
- return ret;
- }
-
- void callString(std::string const& _name, std::string const& _arg)
- {
- BOOST_CHECK(call(_name + "(string)", u256(0x20), _arg.length(), _arg).empty());
- }
-
- void callStringAddress(std::string const& _name, std::string const& _arg1, u160 const& _arg2)
- {
- BOOST_CHECK(call(_name + "(string,address)", u256(0x40), _arg2, _arg1.length(), _arg1).empty());
- }
-
- void callStringAddressBool(std::string const& _name, std::string const& _arg1, u160 const& _arg2, bool _arg3)
- {
- BOOST_CHECK(call(_name + "(string,address,bool)", u256(0x60), _arg2, _arg3, _arg1.length(), _arg1).empty());
- }
-
- void callStringBytes32(std::string const& _name, std::string const& _arg1, h256 const& _arg2)
- {
- BOOST_CHECK(call(_name + "(string,bytes32)", u256(0x40), _arg2, _arg1.length(), _arg1).empty());
- }
-
- u160 callStringReturnsAddress(std::string const& _name, std::string const& _arg)
- {
- bytes const& ret = call(_name + "(string)", u256(0x20), _arg.length(), _arg);
- BOOST_REQUIRE(ret.size() == 0x20);
- BOOST_CHECK(std::count(ret.begin(), ret.begin() + 12, 0) == 12);
- return eth::abiOut<u160>(ret);
- }
-
- std::string callAddressReturnsString(std::string const& _name, u160 const& _arg)
- {
- bytesConstRef ret = ref(call(_name + "(address)", _arg));
- BOOST_REQUIRE(ret.size() >= 0x20);
- u256 offset = eth::abiOut<u256>(ret);
- BOOST_REQUIRE_EQUAL(offset, 0x20);
- u256 len = eth::abiOut<u256>(ret);
- BOOST_REQUIRE_EQUAL(ret.size(), ((len + 0x1f) / 0x20) * 0x20);
- return ret.cropped(0, size_t(len)).toString();
- }
-
- h256 callStringReturnsBytes32(std::string const& _name, std::string const& _arg)
- {
- bytes const& ret = call(_name + "(string)", u256(0x20), _arg.length(), _arg);
- BOOST_REQUIRE(ret.size() == 0x20);
- return eth::abiOut<h256>(ret);
- }
-
- private:
- u256 m_nextValue;
- ExecutionFramework& m_framework;
- };
-
-private:
- template <class CppFunction, class... Args>
- auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
- -> typename std::enable_if<std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
- {
- _cppFunction(_arguments...);
- return bytes();
- }
- template <class CppFunction, class... Args>
- auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
- -> typename std::enable_if<!std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
- {
- return encode(_cppFunction(_arguments...));
- }
-
protected:
- void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0);
- void sendEther(Address const& _to, u256 const& _value);
- size_t currentTimestamp();
-
- /// @returns the (potentially newly created) _ith address.
- Address account(size_t _i);
-
- u256 balanceAt(Address const& _addr);
- bool storageEmpty(Address const& _addr);
- bool addressHasCode(Address const& _addr);
-
- RPCSession& m_rpc;
-
- struct LogEntry
- {
- Address address;
- std::vector<h256> topics;
- bytes data;
- };
-
- size_t m_optimizeRuns = 200;
- bool m_optimize = false;
dev::solidity::CompilerStack m_compiler;
- Address m_sender;
- Address m_contractAddress;
- u256 const m_gasPrice = 100 * szabo;
- u256 const m_gas = 100000000;
- bytes m_output;
- std::vector<LogEntry> m_logs;
- u256 m_gasUsed;
};
}
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index a53a2638..15208b41 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -45,7 +45,7 @@ namespace solidity
namespace test
{
-class OptimizerTestFramework: public ExecutionFramework
+class OptimizerTestFramework: public SolidityExecutionFramework
{
public:
OptimizerTestFramework() { }