mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
LogFilter supports new, better, filter mechanism.
Exposed to JS API.
This commit is contained in:
parent
0678c61293
commit
f9109f2eea
184
whisperTopic.cpp
184
whisperTopic.cpp
@ -87,4 +87,188 @@ BOOST_AUTO_TEST_CASE(topic)
|
||||
BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(forwarding)
|
||||
{
|
||||
cnote << "Testing Whisper forwarding...";
|
||||
auto oldLogVerbosity = g_logVerbosity;
|
||||
g_logVerbosity = 0;
|
||||
|
||||
unsigned result = 0;
|
||||
bool done = false;
|
||||
|
||||
bool startedListener = false;
|
||||
std::thread listener([&]()
|
||||
{
|
||||
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"));
|
||||
|
||||
for (int i = 0; i < 200 && !result; ++i)
|
||||
{
|
||||
for (auto i: wh->checkWatch(w))
|
||||
{
|
||||
Message msg = wh->envelope(i).open();
|
||||
unsigned last = RLP(msg.payload()).toInt<unsigned>();
|
||||
cnote << "New message from:" << msg.from().abridged() << RLP(msg.payload()).toInt<unsigned>();
|
||||
result = last;
|
||||
}
|
||||
this_thread::sleep_for(chrono::milliseconds(50));
|
||||
}
|
||||
});
|
||||
|
||||
bool startedForwarder = false;
|
||||
std::thread forwarder([&]()
|
||||
{
|
||||
setThreadName("forwarder");
|
||||
|
||||
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);
|
||||
|
||||
startedForwarder = true;
|
||||
|
||||
/// Only interested in odd packets
|
||||
auto w = wh->installWatch(BuildTopicMask("test"));
|
||||
|
||||
while (!done)
|
||||
{
|
||||
for (auto i: wh->checkWatch(w))
|
||||
{
|
||||
Message msg = wh->envelope(i).open();
|
||||
cnote << "New message from:" << msg.from().abridged() << RLP(msg.payload()).toInt<unsigned>();
|
||||
}
|
||||
this_thread::sleep_for(chrono::milliseconds(50));
|
||||
}
|
||||
});
|
||||
|
||||
while (!startedForwarder)
|
||||
this_thread::sleep_for(chrono::milliseconds(50));
|
||||
|
||||
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);
|
||||
|
||||
KeyPair us = KeyPair::create();
|
||||
wh->post(us.sec(), RLPStream().append(1).out(), BuildTopic("test"));
|
||||
this_thread::sleep_for(chrono::milliseconds(250));
|
||||
|
||||
listener.join();
|
||||
done = true;
|
||||
forwarder.join();
|
||||
g_logVerbosity = oldLogVerbosity;
|
||||
|
||||
BOOST_REQUIRE_EQUAL(result, 1);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(asyncforwarding)
|
||||
{
|
||||
cnote << "Testing Whisper async forwarding...";
|
||||
auto oldLogVerbosity = g_logVerbosity;
|
||||
g_logVerbosity = 2;
|
||||
|
||||
unsigned result = 0;
|
||||
bool done = false;
|
||||
|
||||
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);
|
||||
|
||||
startedForwarder = true;
|
||||
|
||||
/// Only interested in odd packets
|
||||
auto w = wh->installWatch(BuildTopicMask("test"));
|
||||
|
||||
while (!done)
|
||||
{
|
||||
for (auto i: wh->checkWatch(w))
|
||||
{
|
||||
Message msg = wh->envelope(i).open();
|
||||
cnote << "New message from:" << msg.from().abridged() << RLP(msg.payload()).toInt<unsigned>();
|
||||
}
|
||||
this_thread::sleep_for(chrono::milliseconds(50));
|
||||
}
|
||||
});
|
||||
|
||||
while (!startedForwarder)
|
||||
this_thread::sleep_for(chrono::milliseconds(50));
|
||||
|
||||
{
|
||||
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);
|
||||
|
||||
KeyPair us = KeyPair::create();
|
||||
wh->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);
|
||||
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);
|
||||
|
||||
/// Only interested in odd packets
|
||||
auto w = wh->installWatch(BuildTopicMask("test"));
|
||||
|
||||
for (int i = 0; i < 200 && !result; ++i)
|
||||
{
|
||||
for (auto i: wh->checkWatch(w))
|
||||
{
|
||||
Message msg = wh->envelope(i).open();
|
||||
unsigned last = RLP(msg.payload()).toInt<unsigned>();
|
||||
cnote << "New message from:" << msg.from().abridged() << RLP(msg.payload()).toInt<unsigned>();
|
||||
result = last;
|
||||
}
|
||||
this_thread::sleep_for(chrono::milliseconds(50));
|
||||
}
|
||||
}
|
||||
|
||||
done = true;
|
||||
forwarder.join();
|
||||
g_logVerbosity = oldLogVerbosity;
|
||||
|
||||
BOOST_REQUIRE_EQUAL(result, 1);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_SUITE_END()
|
||||
|
Loading…
Reference in New Issue
Block a user