aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net.cpp19
-rw-r--r--peer.cpp78
-rw-r--r--whisperTopic.cpp159
3 files changed, 172 insertions, 84 deletions
diff --git a/net.cpp b/net.cpp
index 67c50dae..5039c543 100644
--- a/net.cpp
+++ b/net.cpp
@@ -30,7 +30,7 @@ using namespace dev::p2p;
namespace ba = boost::asio;
namespace bi = ba::ip;
-BOOST_AUTO_TEST_SUITE(p2p)
+BOOST_AUTO_TEST_SUITE(net)
/**
* Only used for testing. Not useful beyond tests.
@@ -87,7 +87,7 @@ struct TestNodeTable: public NodeTable
bi::address ourIp = bi::address::from_string("127.0.0.1");
for (auto& n: _testNodes)
if (_count--)
- noteNode(n.first.pub(), bi::udp::endpoint(ourIp, n.second));
+ noteActiveNode(n.first.pub(), bi::udp::endpoint(ourIp, n.second));
else
break;
}
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE(test_neighbours_packet)
out.sign(k.sec());
bytesConstRef packet(out.data.data(), out.data.size());
- bytesConstRef rlpBytes(packet.cropped(97, packet.size() - 97));
+ bytesConstRef rlpBytes(packet.cropped(h256::size + Signature::size + 1));
Neighbours in = Neighbours::fromBytesConstRef(to, rlpBytes);
int count = 0;
for (auto n: in.nodes)
@@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(kademlia)
// Not yet a 'real' test.
TestNodeTableHost node(8);
node.start();
- node.nodeTable->join(); // ideally, joining with empty node table logs warning we can check for
+ node.nodeTable->discover(); // ideally, joining with empty node table logs warning we can check for
node.setup();
node.populate();
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
@@ -190,15 +190,24 @@ BOOST_AUTO_TEST_CASE(kademlia)
node.populateAll();
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
+ auto nodes = node.nodeTable->nodes();
+ nodes.sort();
+
node.nodeTable->reset();
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
node.populate(1);
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
- node.nodeTable->join();
+ node.nodeTable->discover();
this_thread::sleep_for(chrono::milliseconds(2000));
clog << "NodeTable:\n" << *node.nodeTable.get() << endl;
+
+ BOOST_REQUIRE_EQUAL(node.nodeTable->count(), 8);
+
+ auto netNodes = node.nodeTable->nodes();
+ netNodes.sort();
+
}
BOOST_AUTO_TEST_CASE(test_udp_once)
diff --git a/peer.cpp b/peer.cpp
index a99ce720..7f3c19e1 100644
--- a/peer.cpp
+++ b/peer.cpp
@@ -20,6 +20,7 @@
* Peer Network test functions.
*/
+#include <boost/test/unit_test.hpp>
#include <chrono>
#include <thread>
#include <libp2p/Host.h>
@@ -27,12 +28,74 @@ using namespace std;
using namespace dev;
using namespace dev::p2p;
+BOOST_AUTO_TEST_SUITE(p2p)
+
+BOOST_AUTO_TEST_CASE(host)
+{
+ NetworkPreferences host1prefs(30301, "127.0.0.1", true, true);
+ NetworkPreferences host2prefs(30302, "127.0.0.1", true, true);
+
+ Host host1("Test", host1prefs);
+ host1.start();
+
+ Host host2("Test", host2prefs);
+ auto node2 = host2.id();
+ host2.start();
+
+ host1.addNode(node2, "127.0.0.1", host2prefs.listenPort, host2prefs.listenPort);
+
+ this_thread::sleep_for(chrono::seconds(1));
+
+ BOOST_REQUIRE_EQUAL(host1.peerCount(), 1);
+ BOOST_REQUIRE_EQUAL(host2.peerCount(), host1.peerCount());
+}
+
+BOOST_AUTO_TEST_CASE(save_nodes)
+{
+ std::list<Host*> hosts;
+ for (auto i:{0,1,2,3,4,5})
+ {
+ Host* h = new Host("Test", NetworkPreferences(30300 + i, "127.0.0.1", true, true));
+ // starting host is required so listenport is available
+ h->start();
+ while (!h->isStarted())
+ this_thread::sleep_for(chrono::milliseconds(2));
+ hosts.push_back(h);
+ }
+
+ Host& host = *hosts.front();
+ for (auto const& h: hosts)
+ host.addNode(h->id(), "127.0.0.1", h->listenPort(), h->listenPort());
+
+ Host& host2 = *hosts.back();
+ for (auto const& h: hosts)
+ host2.addNode(h->id(), "127.0.0.1", h->listenPort(), h->listenPort());
+
+ this_thread::sleep_for(chrono::milliseconds(1000));
+ bytes firstHostNetwork(host.saveNetwork());
+ bytes secondHostNetwork(host.saveNetwork());
+
+ BOOST_REQUIRE_EQUAL(sha3(firstHostNetwork), sha3(secondHostNetwork));
+
+ BOOST_CHECK_EQUAL(host.peerCount(), 5);
+ BOOST_CHECK_EQUAL(host2.peerCount(), 5);
+
+ RLP r(firstHostNetwork);
+ BOOST_REQUIRE(r.itemCount() == 3);
+ BOOST_REQUIRE(r[0].toInt<int>() == 1);
+ BOOST_REQUIRE_EQUAL(r[1].toBytes().size(), 32); // secret
+ BOOST_REQUIRE_EQUAL(r[2].itemCount(), 5);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
int peerTest(int argc, char** argv)
{
+ Public remoteAlias;
short listenPort = 30303;
string remoteHost;
short remotePort = 30303;
-
+
for (int i = 1; i < argc; ++i)
{
string arg = argv[i];
@@ -42,21 +105,18 @@ int peerTest(int argc, char** argv)
remoteHost = argv[++i];
else if (arg == "-p" && i + 1 < argc)
remotePort = (short)atoi(argv[++i]);
+ else if (arg == "-ra" && i + 1 < argc)
+ remoteAlias = Public(dev::fromHex(argv[++i]));
else
remoteHost = argv[i];
}
Host ph("Test", NetworkPreferences(listenPort));
- if (!remoteHost.empty())
- ph.connect(remoteHost, remotePort);
+ if (!remoteHost.empty() && !remoteAlias)
+ ph.addNode(remoteAlias, remoteHost, remotePort, remotePort);
- for (int i = 0; ; ++i)
- {
- this_thread::sleep_for(chrono::milliseconds(100));
- if (!(i % 10))
- ph.pingAll();
- }
+ this_thread::sleep_for(chrono::milliseconds(200));
return 0;
}
diff --git a/whisperTopic.cpp b/whisperTopic.cpp
index 11937336..be93174e 100644
--- a/whisperTopic.cpp
+++ b/whisperTopic.cpp
@@ -36,27 +36,31 @@ BOOST_AUTO_TEST_CASE(topic)
auto oldLogVerbosity = g_logVerbosity;
g_logVerbosity = 0;
+ Host host1("Test", NetworkPreferences(30303, "127.0.0.1", false, true));
+ auto whost1 = host1.registerCapability(new WhisperHost());
+ host1.start();
+
+ while (!host1.isStarted())
+ this_thread::sleep_for(chrono::milliseconds(2));
+
bool started = false;
unsigned result = 0;
std::thread listener([&]()
{
setThreadName("other");
-
- Host ph("Test", NetworkPreferences(50303, "", false, true));
- auto wh = ph.registerCapability(new WhisperHost());
- ph.start();
+ started = true;
/// Only interested in odd packets
- auto w = wh->installWatch(BuildTopicMask("odd"));
+ auto w = whost1->installWatch(BuildTopicMask("odd"));
started = true;
set<unsigned> received;
for (int iterout = 0, last = 0; iterout < 200 && last < 81; ++iterout)
{
- for (auto i: wh->checkWatch(w))
+ for (auto i: whost1->checkWatch(w))
{
- Message msg = wh->envelope(i).open(wh->fullTopic(w));
+ Message msg = whost1->envelope(i).open(whost1->fullTopic(w));
last = RLP(msg.payload()).toInt<unsigned>();
if (received.count(last))
continue;
@@ -66,22 +70,28 @@ BOOST_AUTO_TEST_CASE(topic)
}
this_thread::sleep_for(chrono::milliseconds(50));
}
+
});
+
+ Host host2("Test", NetworkPreferences(30300, "127.0.0.1", false, true));
+ auto whost2 = host2.registerCapability(new WhisperHost());
+ host2.start();
+
+ while (!host2.isStarted())
+ this_thread::sleep_for(chrono::milliseconds(2));
+
+ this_thread::sleep_for(chrono::milliseconds(100));
+ host2.addNode(host1.id(), "127.0.0.1", 30303, 30303);
+
+ this_thread::sleep_for(chrono::milliseconds(500));
while (!started)
- this_thread::sleep_for(chrono::milliseconds(50));
-
- Host ph("Test", NetworkPreferences(50300, "", false, true));
- shared_ptr<WhisperHost> wh = ph.registerCapability(new WhisperHost());
- this_thread::sleep_for(chrono::milliseconds(500));
- ph.start();
- this_thread::sleep_for(chrono::milliseconds(500));
- ph.connect("127.0.0.1", 50303);
+ this_thread::sleep_for(chrono::milliseconds(2));
KeyPair us = KeyPair::create();
for (int i = 0; i < 10; ++i)
{
- wh->post(us.sec(), RLPStream().append(i * i).out(), BuildTopic(i)(i % 2 ? "odd" : "even"));
+ whost2->post(us.sec(), RLPStream().append(i * i).out(), BuildTopic(i)(i % 2 ? "odd" : "even"));
this_thread::sleep_for(chrono::milliseconds(250));
}
@@ -96,7 +106,15 @@ BOOST_AUTO_TEST_CASE(forwarding)
cnote << "Testing Whisper forwarding...";
auto oldLogVerbosity = g_logVerbosity;
g_logVerbosity = 0;
-
+
+ // Host must be configured not to share peers.
+ Host host1("Listner", NetworkPreferences(30303, "", false, true));
+ host1.setIdealPeerCount(0);
+ auto whost1 = host1.registerCapability(new WhisperHost());
+ host1.start();
+ while (!host1.isStarted())
+ this_thread::sleep_for(chrono::milliseconds(2));
+
unsigned result = 0;
bool done = false;
@@ -105,22 +123,16 @@ BOOST_AUTO_TEST_CASE(forwarding)
{
setThreadName("listener");
- // Host must be configured not to share peers.
- Host ph("Listner", NetworkPreferences(50303, "", false, true));
- ph.setIdealPeerCount(0);
- auto wh = ph.registerCapability(new WhisperHost());
- ph.start();
-
startedListener = true;
/// Only interested in odd packets
- auto w = wh->installWatch(BuildTopicMask("test"));
+ auto w = whost1->installWatch(BuildTopicMask("test"));
for (int i = 0; i < 200 && !result; ++i)
{
- for (auto i: wh->checkWatch(w))
+ for (auto i: whost1->checkWatch(w))
{
- Message msg = wh->envelope(i).open(wh->fullTopic(w));
+ Message msg = whost1->envelope(i).open(whost1->fullTopic(w));
unsigned last = RLP(msg.payload()).toInt<unsigned>();
cnote << "New message from:" << msg.from().abridged() << RLP(msg.payload()).toInt<unsigned>();
result = last;
@@ -129,6 +141,16 @@ BOOST_AUTO_TEST_CASE(forwarding)
}
});
+
+ // Host must be configured not to share peers.
+ Host host2("Forwarder", NetworkPreferences(30305, "", false, true));
+ host2.setIdealPeerCount(1);
+ auto whost2 = host2.registerCapability(new WhisperHost());
+ host2.start();
+ while (!host2.isStarted())
+ this_thread::sleep_for(chrono::milliseconds(2));
+
+ Public fwderid;
bool startedForwarder = false;
std::thread forwarder([&]()
{
@@ -137,26 +159,19 @@ BOOST_AUTO_TEST_CASE(forwarding)
while (!startedListener)
this_thread::sleep_for(chrono::milliseconds(50));
- // Host must be configured not to share peers.
- Host ph("Forwarder", NetworkPreferences(50305, "", false, true));
- ph.setIdealPeerCount(0);
- auto wh = ph.registerCapability(new WhisperHost());
- this_thread::sleep_for(chrono::milliseconds(500));
- ph.start();
-
this_thread::sleep_for(chrono::milliseconds(500));
- ph.connect("127.0.0.1", 50303);
+ host2.addNode(host1.id(), "127.0.0.1", 30303, 30303);
startedForwarder = true;
/// Only interested in odd packets
- auto w = wh->installWatch(BuildTopicMask("test"));
+ auto w = whost2->installWatch(BuildTopicMask("test"));
while (!done)
{
- for (auto i: wh->checkWatch(w))
+ for (auto i: whost2->checkWatch(w))
{
- Message msg = wh->envelope(i).open(wh->fullTopic(w));
+ Message msg = whost2->envelope(i).open(whost2->fullTopic(w));
cnote << "New message from:" << msg.from().abridged() << RLP(msg.payload()).toInt<unsigned>();
}
this_thread::sleep_for(chrono::milliseconds(50));
@@ -166,13 +181,13 @@ BOOST_AUTO_TEST_CASE(forwarding)
while (!startedForwarder)
this_thread::sleep_for(chrono::milliseconds(50));
- Host ph("Sender", NetworkPreferences(50300, "", false, true));
- ph.setIdealPeerCount(0);
+ Host ph("Sender", NetworkPreferences(30300, "", false, true));
+ ph.setIdealPeerCount(1);
shared_ptr<WhisperHost> wh = ph.registerCapability(new WhisperHost());
- this_thread::sleep_for(chrono::milliseconds(500));
ph.start();
- this_thread::sleep_for(chrono::milliseconds(500));
- ph.connect("127.0.0.1", 50305);
+ ph.addNode(host2.id(), "127.0.0.1", 30305, 30305);
+ while (!ph.isStarted())
+ this_thread::sleep_for(chrono::milliseconds(10));
KeyPair us = KeyPair::create();
wh->post(us.sec(), RLPStream().append(1).out(), BuildTopic("test"));
@@ -194,32 +209,33 @@ BOOST_AUTO_TEST_CASE(asyncforwarding)
unsigned result = 0;
bool done = false;
+
+ // Host must be configured not to share peers.
+ Host host1("Forwarder", NetworkPreferences(30305, "", false, true));
+ host1.setIdealPeerCount(1);
+ auto whost1 = host1.registerCapability(new WhisperHost());
+ host1.start();
+ while (!host1.isStarted())
+ this_thread::sleep_for(chrono::milliseconds(2));
bool startedForwarder = false;
std::thread forwarder([&]()
{
setThreadName("forwarder");
-
- // Host must be configured not to share peers.
- Host ph("Forwarder", NetworkPreferences(50305, "", false, true));
- ph.setIdealPeerCount(0);
- auto wh = ph.registerCapability(new WhisperHost());
+
this_thread::sleep_for(chrono::milliseconds(500));
- ph.start();
-
- this_thread::sleep_for(chrono::milliseconds(500));
- ph.connect("127.0.0.1", 50303);
+// ph.addNode("127.0.0.1", 30303, 30303);
startedForwarder = true;
/// Only interested in odd packets
- auto w = wh->installWatch(BuildTopicMask("test"));
+ auto w = whost1->installWatch(BuildTopicMask("test"));
while (!done)
{
- for (auto i: wh->checkWatch(w))
+ for (auto i: whost1->checkWatch(w))
{
- Message msg = wh->envelope(i).open(wh->fullTopic(w));
+ Message msg = whost1->envelope(i).open(whost1->fullTopic(w));
cnote << "New message from:" << msg.from().abridged() << RLP(msg.payload()).toInt<unsigned>();
}
this_thread::sleep_for(chrono::milliseconds(50));
@@ -227,30 +243,33 @@ BOOST_AUTO_TEST_CASE(asyncforwarding)
});
while (!startedForwarder)
- this_thread::sleep_for(chrono::milliseconds(50));
-
+ this_thread::sleep_for(chrono::milliseconds(2));
+
{
- Host ph("Sender", NetworkPreferences(50300, "", false, true));
- ph.setIdealPeerCount(0);
- shared_ptr<WhisperHost> wh = ph.registerCapability(new WhisperHost());
- this_thread::sleep_for(chrono::milliseconds(500));
- ph.start();
- this_thread::sleep_for(chrono::milliseconds(500));
- ph.connect("127.0.0.1", 50305);
-
+ Host host2("Sender", NetworkPreferences(30300, "", false, true));
+ host2.setIdealPeerCount(1);
+ shared_ptr<WhisperHost> whost2 = host2.registerCapability(new WhisperHost());
+ host2.start();
+ while (!host2.isStarted())
+ this_thread::sleep_for(chrono::milliseconds(2));
+ host2.addNode(host1.id(), "127.0.0.1", 30305, 30305);
+
+ while (!host2.peerCount())
+ this_thread::sleep_for(chrono::milliseconds(5));
+
KeyPair us = KeyPair::create();
- wh->post(us.sec(), RLPStream().append(1).out(), BuildTopic("test"));
+ whost2->post(us.sec(), RLPStream().append(1).out(), BuildTopic("test"));
this_thread::sleep_for(chrono::milliseconds(250));
}
{
- Host ph("Listener", NetworkPreferences(50300, "", false, true));
- ph.setIdealPeerCount(0);
+ Host ph("Listener", NetworkPreferences(30300, "", false, true));
+ ph.setIdealPeerCount(1);
shared_ptr<WhisperHost> wh = ph.registerCapability(new WhisperHost());
- this_thread::sleep_for(chrono::milliseconds(500));
ph.start();
- this_thread::sleep_for(chrono::milliseconds(500));
- ph.connect("127.0.0.1", 50305);
+ while (!ph.isStarted())
+ this_thread::sleep_for(chrono::milliseconds(2));
+ ph.addNode(host1.id(), "127.0.0.1", 30305, 30305);
/// Only interested in odd packets
auto w = wh->installWatch(BuildTopicMask("test"));
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 10:15:43 +0800