cerc-io/solidity
10
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

message signing and verification. shutdown io/thread before dealloc in nodetable/testnodetables.

Browse Source
This commit is contained in:
subtly 2014-12-24 10:22:27 +01:00
parent 25a905b740
commit aad7141f0a
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
net.cpp
View File

@ -42,6 +42,7 @@ public:
virtual ~TestHost() { m_io.stop(); stopWorking(); } virtual ~TestHost() { m_io.stop(); stopWorking(); }
void start() { startWorking(); } void start() { startWorking(); }
void doWork() { m_io.run(); } void doWork() { m_io.run(); }
void doneWorking() { m_io.reset(); m_io.poll(); m_io.reset(); }
protected: protected:
ba::io_service m_io; ba::io_service m_io;
@ -52,18 +53,20 @@ struct TestNodeTable: public NodeTable
/// Constructor /// Constructor
using NodeTable::NodeTable; using NodeTable::NodeTable;
void setup(std::vector<std::pair<KeyPair,unsigned>> const& _testNodes) void pingAll(std::vector<std::pair<KeyPair,unsigned>> const& _testNodes)
{ {
/// Phase 2 test: pre-populate *expected* ping-responses, send pings
bi::address ourIp = bi::address::from_string("127.0.0.1"); bi::address ourIp = bi::address::from_string("127.0.0.1");
uint16_t ourPort = 30300;
bi::udp::endpoint ourEndpoint(ourIp, ourPort);
for (auto& n: _testNodes) for (auto& n: _testNodes)
ping(bi::udp::endpoint(ourIp, n.second)); ping(bi::udp::endpoint(ourIp, n.second));
} }
void populate(std::vector<std::pair<KeyPair,unsigned>> const& _testNodes)
{
bi::address ourIp = bi::address::from_string("127.0.0.1");
for (auto& n: _testNodes)
noteNode(n.first.pub(), bi::udp::endpoint(ourIp, n.second));
}
void reset() void reset()
{ {
Guard l(x_state); Guard l(x_state);
@ -77,8 +80,9 @@ struct TestNodeTable: public NodeTable
struct TestNodeTableHost: public TestHost struct TestNodeTableHost: public TestHost
{ {
TestNodeTableHost(): m_alias(KeyPair::create()), nodeTable(new TestNodeTable(m_io, m_alias)) {}; TestNodeTableHost(): m_alias(KeyPair::create()), nodeTable(new TestNodeTable(m_io, m_alias)) {};
~TestNodeTableHost() { m_io.stop(); stopWorking(); }
void generateTestNodes(int _count = 10) void generateTestNodes(int _count = 30)
{ {
asserts(_count < 1000); asserts(_count < 1000);
static uint16_t s_basePort = 30500; static uint16_t s_basePort = 30500;
@ -96,7 +100,16 @@ struct TestNodeTableHost: public TestHost
void setup() void setup()
{ {
generateTestNodes(); generateTestNodes();
nodeTable->setup(m_testNodes); }
void pingAll()
{
nodeTable->pingAll(m_testNodes);
}
void populate()
{
nodeTable->populate(m_testNodes);
} }
KeyPair m_alias; KeyPair m_alias;
@ -123,7 +136,10 @@ BOOST_AUTO_TEST_CASE(kademlia)
node.start(); node.start();
node.nodeTable->join(); // ideally, joining with empty node table logs warning we can check for node.nodeTable->join(); // ideally, joining with empty node table logs warning we can check for
node.setup(); node.setup();
sleep(1); node.pingAll();
this_thread::sleep_for(chrono::milliseconds(500));
cout << "NodeTable:\n" << *node.nodeTable.get() << endl;
} }
BOOST_AUTO_TEST_CASE(test_txrx_one) BOOST_AUTO_TEST_CASE(test_txrx_one)