lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #161 from autolycus/develop 

CmakeLists.txt formatting and additional tests
cl-refactor
Gav Wood 11 years ago
parent
772319bbf4 b17182a869
commit
8ba37e38fa
8 changed files with 473 additions and 308 deletions
Split View
  1. 48
      CMakeLists.txt
  2. 2
      libethereum/Instruction.cpp
  3. 29
      test/crypto.cpp
  4. 32
      test/hexPrefix.cpp
  5. 8
      test/main.cpp
  6. 146
      test/rlp.cpp
  7. 38
      test/trie.cpp
  8. 104
      test/vm.cpp

48
CMakeLists.txt
View File

@ -138,6 +138,54 @@ else ()
if(NOT APPLE)
link_directories(${CRYPTOPP_LIBRARIES})
endif()
find_path( LEVELDB_ID leveldb/db.h
/usr/include
/usr/local/include
)
if ( LEVELDB_ID )
message(STATUS "Found LevelDB Headers")
else ()
message(FATAL_ERROR "Failed to find the LevelDB headers")
endif ()
# Check for accessory dev libraries leveldb and miniupnpc
find_library( LEVELDB_LS NAMES leveldb
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
/usr/lib/*/
)
if ( LEVELDB_LS )
message(STATUS "Found LevelDB Library: ${LEVELDB_LS}")
else ()
message(FATAL_ERROR "Failed to find the LevelDB Library!")
endif ()
find_path( MINIUPNPC_ID miniupnpc/miniwget.h
/usr/include/miniupnpc
/usr/local/include/miniupnpc
)
if ( MINIUPNPC_ID )
message(STATUS "Found miniupnpc headers")
else ()
message(FATAL_ERROR "Failed to find the miniupnpc headers!")
endif ()
find_library( MINIUPNPC_LS NAMES miniupnpc
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
/usr/lib/*/
)
if ( MINIUPNPC_LS )
message(STATUS "Found miniupnpc library: ${MINIUPNPC_LS}")
else ()
message(FATAL_ERROR "Failed to find the miniupnpc library!")
endif ()
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

2
libethereum/Instruction.cpp
View File

@ -115,7 +115,7 @@ const std::map<std::string, Instruction> eth::c_instructions =
};
const std::map<Instruction, InstructionInfo> eth::c_instructionInfo =
{
{ // Add, Args, Ret
{ Instruction::STOP, { "STOP", 0, 0, 0 } },
{ Instruction::ADD, { "ADD", 0, 2, 1 } },
{ Instruction::SUB, { "SUB", 0, 2, 1 } },

29
test/crypto.cpp
View File

@ -26,9 +26,38 @@
#include <RLP.h>
#include <Log.h>
#include <Transaction.h>
#include <boost/test/unit_test.hpp>
using namespace std;
using namespace eth;
BOOST_AUTO_TEST_CASE(crypto_tests)
{
cnote << "Testing Crypto...";
secp256k1_start();
KeyPair p(Secret(fromHex("3ecb44df2159c26e0f995712d4f39b6f6e499b40749b1cf1246c37f9516cb6a4")));
BOOST_REQUIRE(p.pub() == Public(fromHex("97466f2b32bc3bb76d4741ae51cd1d8578b48d3f1e68da206d47321aec267ce78549b514e4453d74ef11b0cd5e4e4c364effddac8b51bcfc8de80682f952896f")));
BOOST_REQUIRE(p.address() == Address(fromHex("8a40bfaa73256b60764c1bf40675a99083efb075")));
{
Transaction t;
t.nonce = 0;
t.receiveAddress = h160(fromHex("944400f4b88ac9589a0f17ed4671da26bddb668b"));
t.value = 1000;
cnote << RLP(t.rlp(false));
cnote << toHex(t.rlp(false));
cnote << t.sha3(false);
t.sign(p.secret());
cnote << RLP(t.rlp(true));
cnote << toHex(t.rlp(true));
cnote << t.sha3(true);
BOOST_REQUIRE(t.sender() == p.address());
}
}
int cryptoTest()
{
cnote << "Testing Crypto...";

32
test/hexPrefix.cpp
View File

@ -24,22 +24,19 @@
#include "JsonSpiritHeaders.h"
#include "TrieCommon.h"
#include "Log.h"
#include <boost/test/unit_test.hpp>
using namespace std;
using namespace eth;
namespace js = json_spirit;
namespace eth
{
template <> class UnitTest<3>
{
public:
int operator()()
BOOST_AUTO_TEST_CASE(hexPrefix_test)
{
cnote << "Testing Hex-Prefix-Encode...";
js::mValue v;
string s = asString(contents("../../tests/hexencodetest.json"));
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Content from 'hexencodetest.json' is empty. Have you cloned the 'tests' repo branch develop?");
js::read_string(s, v);
bool passed = true;
for (auto& i: v.get_obj())
{
js::mObject& o = i.second.get_obj();
@ -48,23 +45,8 @@ public:
for (auto& i: o["seq"].get_array())
v.push_back((byte)i.get_int());
auto e = hexPrefixEncode(v, o["term"].get_bool());
if (!o["out"].is_null() && o["out"].get_str() != toHex(e))
{
cwarn << "Test failed.";
cwarn << "Test says:" << o["out"].get_str();
cwarn << "Impl says:" << toHex(e);
passed = false;
}
BOOST_REQUIRE( ! o["out"].is_null() );
BOOST_CHECK( o["out"].get_str() == toHex(e) );
}
return passed ? 0 : 1;
}
};
}
int hexPrefixTest()
{
cnote << "Testing Hex-Prefix-Encode...";
return UnitTest<3>()();
}

8
test/main.cpp
View File

@ -45,14 +45,10 @@ BOOST_AUTO_TEST_CASE(basic_tests)
std::cout << sha3(s.out()) << std::endl;*/
int r = 0;
r += hexPrefixTest();
r += rlpTest();
r += trieTest();
r += vmTest();
r += cryptoTest(); // TODO: Put in tests repo.
// r += daggerTest();
// r += stateTest();
// r += peerTest(argc, argv);
BOOST_REQUIRE(!r);
// BOOST_REQUIRE(!r);
}

146
test/rlp.cpp
View File

@ -21,19 +21,22 @@
*/
#include <fstream>
#include <sstream>
#include "JsonSpiritHeaders.h"
#include <Log.h>
#include <RLP.h>
#include <Common.h>
#include <boost/test/unit_test.hpp>
#include <algorithm>
using namespace std;
using namespace eth;
namespace js = json_spirit;
namespace eth
{
template <> class UnitTest<2>
namespace test
{
public:
static void buildRLP(js::mValue& _v, RLPStream& _rlp)
{
if (_v.type() == js::array_type)
@ -55,35 +58,136 @@ public:
}
}
int operator()()
static void getRLPTestCases(js::mValue& v)
{
js::mValue v;
string s = asString(contents("../../tests/rlptest.json"));
BOOST_REQUIRE_MESSAGE( s.length() > 0,
"Contents of 'rlptest.json' is empty. Have you cloned the 'tests' repo branch develop?");
js::read_string(s, v);
bool passed = true;
for (auto& i: v.get_obj())
}
static void checkRLPTestCase(js::mObject& o)
{
js::mObject& o = i.second.get_obj();
cnote << i.first;
RLPStream s;
buildRLP(o["in"], s);
if (!o["out"].is_null() && o["out"].get_str() != toHex(s.out()))
BOOST_REQUIRE( o.count("in") > 0 );
BOOST_REQUIRE( o.count("out") > 0 );
BOOST_REQUIRE(!o["out"].is_null());
}
static void checkRLPAgainstJson(js::mValue& v, RLP& u)
{
if ( v.type() == js::str_type )
{
const std::string& expectedText = v.get_str();
if ( expectedText.front() == '#' )
{
// Deal with bigint instead of a raw string
std::string bigIntStr = expectedText.substr(1,expectedText.length()-1);
std::stringstream bintStream(bigIntStr);
bigint val;
bintStream >> val;
BOOST_CHECK( !u.isList() );
BOOST_CHECK( !u.isNull() );
BOOST_CHECK( u ); // operator bool()
BOOST_CHECK(u == val);
}
else
{
BOOST_CHECK( !u.isList() );
BOOST_CHECK( !u.isNull() );
BOOST_CHECK( u.isData() );
BOOST_CHECK( u );
BOOST_CHECK( u.size() == expectedText.length() );
BOOST_CHECK(u == expectedText);
}
}
else if ( v.type() == js::int_type )
{
const int expectedValue = v.get_int();
BOOST_CHECK( u.isInt() );
BOOST_CHECK( !u.isList() );
BOOST_CHECK( !u.isNull() );
BOOST_CHECK( u ); // operator bool()
BOOST_CHECK(u == expectedValue);
}
else if ( v.type() == js::array_type )
{
cwarn << "Test failed.";
cwarn << "Test says:" << o["out"].get_str();
cwarn << "Impl says:" << toHex(s.out());
passed = false;
BOOST_CHECK( u.isList() );
BOOST_CHECK( !u.isInt() );
BOOST_CHECK( !u.isData() );
js::mArray& arr = v.get_array();
BOOST_CHECK( u.itemCount() == arr.size() );
uint i;
for( i = 0; i < arr.size(); i++ )
{
RLP item = u[i];
checkRLPAgainstJson(arr[i], item);
}
}
else
{
BOOST_ERROR("Invalid Javascript object!");
}
}
}
return passed ? 0 : 1;
}
};
BOOST_AUTO_TEST_CASE(rlp_encoding_test)
{
cnote << "Testing RLP Encoding...";
js::mValue v;
eth::test::getRLPTestCases(v);
for (auto& i: v.get_obj())
{
js::mObject& o = i.second.get_obj();
cnote << i.first;
eth::test::checkRLPTestCase(o);
RLPStream s;
eth::test::buildRLP(o["in"], s);
std::string expectedText(o["out"].get_str());
std::transform(expectedText.begin(), expectedText.end(), expectedText.begin(), ::tolower );
const std::string& computedText = toHex(s.out());
std::stringstream msg;
msg << "Encoding Failed: expected: " << expectedText << std::endl;
msg << " But Computed: " << computedText;
BOOST_CHECK_MESSAGE(
expectedText == computedText,
msg.str()
);
}
int rlpTest()
}
BOOST_AUTO_TEST_CASE(rlp_decoding_test)
{
cnote << "Testing RLP decoding...";
// Uses the same test cases as encoding but in reverse.
// We read into the string of hex values, convert to bytes,
// and then compare the output structure to the json of the
// input object.
js::mValue v;
eth::test::getRLPTestCases(v);
for (auto& i: v.get_obj())
{
cnote << "Testing RLP...";
return UnitTest<2>()();
js::mObject& o = i.second.get_obj();
cnote << i.first;
eth::test::checkRLPTestCase(o);
js::mValue& inputData = o["in"];
bytes payloadToDecode = fromHex(o["out"].get_str());
RLP payload(payloadToDecode);
eth::test::checkRLPAgainstJson(inputData, payload);
}
}

38
test/trie.cpp
View File

@ -26,6 +26,8 @@
#include <TrieDB.h>
#include "TrieHash.h"
#include "MemTrie.h"
#include <boost/test/unit_test.hpp>
using namespace std;
using namespace eth;
@ -33,18 +35,25 @@ namespace js = json_spirit;
namespace eth
{
namespace test
{
static unsigned fac(unsigned _i)
{
return _i > 2 ? _i * fac(_i - 1) : _i;
}
unsigned fac(unsigned _i) { return _i > 2 ? _i * fac(_i - 1) : _i; }
}
}
template <> class UnitTest<4>
{
public:
int operator()()
BOOST_AUTO_TEST_CASE(trie_tests)
{
cnote << "Testing Trie...";
js::mValue v;
string s = asString(contents("../../tests/trietest.json"));
BOOST_REQUIRE_MESSAGE( s.length() > 0, "Contents of 'trietest.json' is empty. Have you cloned the 'tests' repo branch develop?");
js::read_string(s, v);
bool passed = true;
for (auto& i: v.get_obj())
{
js::mObject& o = i.second.get_obj();
@ -52,7 +61,7 @@ public:
vector<pair<string, string>> ss;
for (auto& i: o["in"].get_obj())
ss.push_back(make_pair(i.first, i.second.get_str()));
for (unsigned j = 0; j < fac((unsigned)ss.size()); ++j)
for (unsigned j = 0; j < eth::test::fac((unsigned)ss.size()); ++j)
{
next_permutation(ss.begin(), ss.end());
BasicMap m;
@ -60,21 +69,12 @@ public:
t.init();
for (auto const& k: ss)
t.insert(k.first, k.second);
if (!o["root"].is_null() && o["root"].get_str() != toHex(t.root().asArray()))
{
cwarn << "Test failed on permutation " << j;
cwarn << "Test says:" << o["root"].get_str();
cwarn << "Impl says:" << toHex(t.root().asArray());
passed = false;
}
BOOST_REQUIRE(!o["root"].is_null());
BOOST_CHECK(o["root"].get_str() == toHex(t.root().asArray()) );
}
}
return passed ? 0 : 1;
}
};
}
inline h256 stringMapHash256(StringMap const& _s)
{
@ -83,8 +83,6 @@ inline h256 stringMapHash256(StringMap const& _s)
int trieTest()
{
cnote << "Testing Trie...";
return UnitTest<4>()();
// More tests...
{

104
test/vm.cpp
View File

@ -27,12 +27,13 @@
#include <Log.h>
#include <Instruction.h>
#include "JsonSpiritHeaders.h"
#include <boost/test/unit_test.hpp>
using namespace std;
using namespace json_spirit;
using namespace eth;
namespace eth
{
namespace eth { namespace test {
class FakeExtVM: public ExtVMFace
{
@ -135,6 +136,12 @@ public:
void importEnv(mObject& _o)
{
BOOST_REQUIRE(_o.count("previousHash") > 0 );
BOOST_REQUIRE(_o.count("previousNonce") > 0 );
BOOST_REQUIRE(_o.count("currentDifficulty") > 0 );
BOOST_REQUIRE(_o.count("currentTimestamp") > 0 );
BOOST_REQUIRE(_o.count("currentCoinbase") > 0 );
previousBlock.hash = h256(_o["previousHash"].get_str());
previousBlock.nonce = h256(_o["previousNonce"].get_str());
currentBlock.difficulty = toInt(_o["currentDifficulty"]);
@ -228,6 +235,10 @@ public:
for (auto const& i: _o)
{
mObject o = i.second.get_obj();
BOOST_REQUIRE(o.count("balance") > 0 );
BOOST_REQUIRE(o.count("nonce") > 0 );
BOOST_REQUIRE(o.count("store") > 0 );
auto& a = addresses[Address(i.first)];
get<0>(a) = toInt(o["balance"]);
get<1>(a) = toInt(o["nonce"]);
@ -249,6 +260,7 @@ public:
mObject exportExec()
{
mObject ret;
ret["address"] = toString(myAddress);
ret["caller"] = toString(caller);
@ -264,6 +276,13 @@ public:
void importExec(mObject& _o)
{
BOOST_REQUIRE(_o.count("address")> 0);
BOOST_REQUIRE(_o.count("caller") > 0);
BOOST_REQUIRE(_o.count("origin") > 0);
BOOST_REQUIRE(_o.count("value") > 0);
BOOST_REQUIRE(_o.count("gasPrice") > 0);
BOOST_REQUIRE(_o.count("data") > 0 );
myAddress = Address(_o["address"].get_str());
caller = Address(_o["caller"].get_str());
origin = Address(_o["origin"].get_str());
@ -297,6 +316,9 @@ public:
for (mValue& v: _txs)
{
auto tx = v.get_obj();
BOOST_REQUIRE(tx.count("destination") > 0);
BOOST_REQUIRE(tx.count("value") > 0 );
BOOST_REQUIRE(tx.count("data") > 0 );
Transaction t;
t.receiveAddress = Address(tx["destination"].get_str());
t.value = toInt(tx["value"]);
@ -311,37 +333,20 @@ public:
bytes thisTxData;
};
#define CREATE_TESTS 0
template <> class UnitTest<1>
{
public:
int operator()()
{
json_spirit::mValue v;
#if CREATE_TESTS
string s = asString(contents("../../cpp-ethereum/test/vmtests.json"));
json_spirit::read_string(s, v);
bool passed = doTests(v, true);
cout << json_spirit::write_string(v, true) << endl;
#else
string s = asString(contents("../../tests/vmtests.json"));
json_spirit::read_string(s, v);
bool passed = doTests(v, false);
#endif
return passed ? 0 : 1;
}
bool doTests(json_spirit::mValue& v, bool _fillin)
void doTests(json_spirit::mValue& v, bool _fillin)
{
bool passed = true;
for (auto& i: v.get_obj())
{
cnote << i.first;
mObject& o = i.second.get_obj();
BOOST_REQUIRE( o.count("env") > 0 );
BOOST_REQUIRE( o.count("pre") > 0 );
BOOST_REQUIRE( o.count("exec") > 0 );
VM vm;
FakeExtVM fev;
eth::test::FakeExtVM fev;
fev.importEnv(o["env"].get_obj());
fev.importState(o["pre"].get_obj());
@ -365,37 +370,44 @@ public:
}
else
{
FakeExtVM test;
BOOST_REQUIRE( o.count("post") > 0 );
BOOST_REQUIRE( o.count("txs") > 0 );
BOOST_REQUIRE( o.count("out") > 0 );
eth::test::FakeExtVM test;
test.importState(o["post"].get_obj());
test.importTxs(o["txs"].get_array());
int i = 0;
for (auto const& d: o["out"].get_array())
{
if (output[i] != FakeExtVM::toInt(d))
{
cwarn << "Test failed: output byte" << i << "different.";
passed = false;
}
BOOST_CHECK_MESSAGE( output[i] == FakeExtVM::toInt(d), "Output byte [" << i << "] different!");
++i;
}
BOOST_CHECK( test.addresses == fev.addresses);
BOOST_CHECK( test.txs == fev.txs );
}
}
}
} } // Namespace Close
if (test.addresses != fev.addresses)
BOOST_AUTO_TEST_CASE(vm_tests)
{
cwarn << "Test failed: state different.";
passed = false;
}
if (test.txs != fev.txs)
try
{
cwarn << "Test failed: tx list different:";
cwarn << test.txs;
cwarn << fev.txs;
passed = false;
}
cnote << "Testing VM...";
json_spirit::mValue v;
string s = asString(contents("../../tests/vmtests.json"));
BOOST_REQUIRE_MESSAGE( s.length() > 0, "Contents of 'vmtests.json' is empty. Have you cloned the 'tests' repo branch develop?" );
json_spirit::read_string(s, v);
eth::test::doTests(v, false);
}
catch( std::exception& e)
{
BOOST_ERROR("Failed VM Test with Exception: " << e.what());
}
return passed;
}
#if 0
string makeTestCase()
{
json_spirit::mObject o;
@ -427,9 +439,5 @@ public:
}
int vmTest()
{
cnote << "Testing VM...";
return UnitTest<1>()();
}
#endif

Write Preview
Loading…
Cancel
Save