mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
test encoding/decoding neighbors. add MAC.
This commit is contained in:
parent
7553954cf2
commit
b663349524
103
net.cpp
103
net.cpp
@ -53,7 +53,23 @@ struct TestNodeTable: public NodeTable
|
|||||||
/// Constructor
|
/// Constructor
|
||||||
using NodeTable::NodeTable;
|
using NodeTable::NodeTable;
|
||||||
|
|
||||||
void pingAll(std::vector<std::pair<KeyPair,unsigned>> const& _testNodes)
|
static std::vector<std::pair<KeyPair,unsigned>> createTestNodes(int _count = 16)
|
||||||
|
{
|
||||||
|
std::vector<std::pair<KeyPair,unsigned>> ret;
|
||||||
|
asserts(_count < 1000);
|
||||||
|
static uint16_t s_basePort = 30500;
|
||||||
|
|
||||||
|
ret.clear();
|
||||||
|
for (auto i = 0; i < _count; i++)
|
||||||
|
{
|
||||||
|
KeyPair k = KeyPair::create();
|
||||||
|
ret.push_back(make_pair(k,s_basePort+i));
|
||||||
|
}
|
||||||
|
|
||||||
|
return std::move(ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
void pingTestNodes(std::vector<std::pair<KeyPair,unsigned>> const& _testNodes)
|
||||||
{
|
{
|
||||||
bi::address ourIp = bi::address::from_string("127.0.0.1");
|
bi::address ourIp = bi::address::from_string("127.0.0.1");
|
||||||
for (auto& n: _testNodes)
|
for (auto& n: _testNodes)
|
||||||
@ -63,7 +79,7 @@ struct TestNodeTable: public NodeTable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void populate(std::vector<std::pair<KeyPair,unsigned>> const& _testNodes, size_t _count = 0)
|
void populateTestNodes(std::vector<std::pair<KeyPair,unsigned>> const& _testNodes, size_t _count = 0)
|
||||||
{
|
{
|
||||||
if (!_count)
|
if (!_count)
|
||||||
_count = _testNodes.size();
|
_count = _testNodes.size();
|
||||||
@ -88,44 +104,19 @@ 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)), testNodes(TestNodeTable::createTestNodes()) {};
|
||||||
~TestNodeTableHost() { m_io.stop(); stopWorking(); }
|
~TestNodeTableHost() { m_io.stop(); stopWorking(); }
|
||||||
|
|
||||||
void generateTestNodes(int _count = 16)
|
void setup() { for (auto n: testNodes) nodeTables.push_back(make_shared<TestNodeTable>(m_io,n.first,n.second)); }
|
||||||
{
|
|
||||||
asserts(_count < 1000);
|
|
||||||
static uint16_t s_basePort = 30500;
|
|
||||||
|
|
||||||
m_testNodes.clear();
|
void pingAll() { for (auto& t: nodeTables) t->pingTestNodes(testNodes); }
|
||||||
for (auto i = 0; i < _count; i++)
|
|
||||||
{
|
|
||||||
KeyPair k = KeyPair::create();
|
|
||||||
m_testNodes.push_back(make_pair(k,s_basePort+i));
|
|
||||||
testNodes.push_back(make_shared<TestNodeTable>(m_io,k,s_basePort+i));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
std::vector<std::pair<KeyPair,unsigned>> m_testNodes; // keypair and port
|
|
||||||
|
|
||||||
void setup()
|
void populate(size_t _count = 0) { nodeTable->populateTestNodes(testNodes, _count); }
|
||||||
{
|
|
||||||
generateTestNodes();
|
|
||||||
}
|
|
||||||
|
|
||||||
void pingAll()
|
|
||||||
{
|
|
||||||
nodeTable->pingAll(m_testNodes);
|
|
||||||
// for (auto& n: testNodes)
|
|
||||||
// n->pingAll(m_testNodes);
|
|
||||||
}
|
|
||||||
|
|
||||||
void populate(size_t _count = 0)
|
|
||||||
{
|
|
||||||
nodeTable->populate(m_testNodes, _count);
|
|
||||||
}
|
|
||||||
|
|
||||||
KeyPair m_alias;
|
KeyPair m_alias;
|
||||||
shared_ptr<TestNodeTable> nodeTable;
|
shared_ptr<TestNodeTable> nodeTable;
|
||||||
std::vector<shared_ptr<TestNodeTable>> testNodes;
|
std::vector<std::pair<KeyPair,unsigned>> testNodes; // keypair and port
|
||||||
|
std::vector<shared_ptr<TestNodeTable>> nodeTables;
|
||||||
};
|
};
|
||||||
|
|
||||||
class TestUDPSocket: UDPSocketEvents, public TestHost
|
class TestUDPSocket: UDPSocketEvents, public TestHost
|
||||||
@ -141,6 +132,36 @@ public:
|
|||||||
bool success = false;
|
bool success = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(test_neighbors_packet)
|
||||||
|
{
|
||||||
|
KeyPair k = KeyPair::create();
|
||||||
|
std::vector<std::pair<KeyPair,unsigned>> testNodes(TestNodeTable::createTestNodes());
|
||||||
|
bi::udp::endpoint to(boost::asio::ip::address::from_string("127.0.0.1"), 30000);
|
||||||
|
|
||||||
|
Neighbors out(to);
|
||||||
|
for (auto n: testNodes)
|
||||||
|
{
|
||||||
|
Neighbors::Node node;
|
||||||
|
node.ipAddress = boost::asio::ip::address::from_string("127.0.0.1").to_string();
|
||||||
|
node.port = n.second;
|
||||||
|
node.node = n.first.pub();
|
||||||
|
out.nodes.push_back(node);
|
||||||
|
}
|
||||||
|
out.sign(k.sec());
|
||||||
|
|
||||||
|
bytesConstRef packet(out.data.data(), out.data.size());
|
||||||
|
bytesConstRef rlpBytes(packet.cropped(97, packet.size() - 97));
|
||||||
|
Neighbors in = Neighbors::fromBytesConstRef(to, rlpBytes);
|
||||||
|
int count = 0;
|
||||||
|
for (auto n: in.nodes)
|
||||||
|
{
|
||||||
|
BOOST_REQUIRE_EQUAL(testNodes[count].second, n.port);
|
||||||
|
BOOST_REQUIRE_EQUAL(testNodes[count].first.pub(), n.node);
|
||||||
|
BOOST_REQUIRE_EQUAL(sha3(testNodes[count].first.pub()), sha3(n.node));
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(test_findnode_neighbors)
|
BOOST_AUTO_TEST_CASE(test_findnode_neighbors)
|
||||||
{
|
{
|
||||||
// Executing findNode should result in a list which is serialized
|
// Executing findNode should result in a list which is serialized
|
||||||
@ -154,21 +175,23 @@ 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();
|
||||||
node.pingAll();
|
node.populate();
|
||||||
|
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
|
||||||
|
|
||||||
|
node.pingAll();
|
||||||
|
this_thread::sleep_for(chrono::milliseconds(4000));
|
||||||
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
|
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
|
||||||
this_thread::sleep_for(chrono::milliseconds(10000));
|
|
||||||
|
|
||||||
node.nodeTable->reset();
|
node.nodeTable->reset();
|
||||||
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
|
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
|
||||||
|
|
||||||
node.populate(2);
|
node.populate(2);
|
||||||
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
|
|
||||||
this_thread::sleep_for(chrono::milliseconds(500));
|
this_thread::sleep_for(chrono::milliseconds(500));
|
||||||
|
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
|
||||||
|
|
||||||
// node.nodeTable->join();
|
node.nodeTable->join();
|
||||||
// this_thread::sleep_for(chrono::milliseconds(2000));
|
this_thread::sleep_for(chrono::milliseconds(2000));
|
||||||
//
|
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
|
||||||
// clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(test_udp_once)
|
BOOST_AUTO_TEST_CASE(test_udp_once)
|
||||||
|
Loading…
Reference in New Issue
Block a user