diff options
| -rw-r--r-- | net.cpp | 8 | ||||
| -rw-r--r-- | whisperTopic.cpp | 22 |
2 files changed, 15 insertions, 15 deletions
@@ -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; } @@ -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; @@ -199,11 +199,11 @@ BOOST_AUTO_TEST_CASE(kademlia) 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->size(), 8); + BOOST_REQUIRE_EQUAL(node.nodeTable->count(), 8); auto netNodes = node.nodeTable->nodes(); netNodes.sort(); diff --git a/whisperTopic.cpp b/whisperTopic.cpp index 1dcc6b9d..e59a3f28 100644 --- a/whisperTopic.cpp +++ b/whisperTopic.cpp @@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE(forwarding) setThreadName("listener"); // Host must be configured not to share peers. - Host ph("Listner", NetworkPreferences(50303, "", false, true)); + Host ph("Listner", NetworkPreferences(30303, "", false, true)); ph.setIdealPeerCount(0); auto wh = ph.registerCapability(new WhisperHost()); ph.start(); @@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(forwarding) this_thread::sleep_for(chrono::milliseconds(50)); // Host must be configured not to share peers. - Host ph("Forwarder", NetworkPreferences(50305, "", false, true)); + Host ph("Forwarder", NetworkPreferences(30305, "", false, true)); ph.setIdealPeerCount(0); auto wh = ph.registerCapability(new WhisperHost()); this_thread::sleep_for(chrono::milliseconds(500)); @@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE(forwarding) fwderid = ph.id(); this_thread::sleep_for(chrono::milliseconds(500)); - ph.addNode(phid, "127.0.0.1", 50303, 50303); + ph.addNode(phid, "127.0.0.1", 30303, 30303); startedForwarder = true; @@ -174,13 +174,13 @@ BOOST_AUTO_TEST_CASE(forwarding) while (!startedForwarder) this_thread::sleep_for(chrono::milliseconds(50)); - Host ph("Sender", NetworkPreferences(50300, "", false, true)); + Host ph("Sender", NetworkPreferences(30300, "", 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.addNode(fwderid, "127.0.0.1", 50305, 50305); + ph.addNode(fwderid, "127.0.0.1", 30305, 30305); KeyPair us = KeyPair::create(); wh->post(us.sec(), RLPStream().append(1).out(), BuildTopic("test")); @@ -210,14 +210,14 @@ BOOST_AUTO_TEST_CASE(asyncforwarding) setThreadName("forwarder"); // Host must be configured not to share peers. - Host ph("Forwarder", NetworkPreferences(50305, "", false, true)); + Host ph("Forwarder", NetworkPreferences(30305, "", 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.addNode("127.0.0.1", 50303, 50303); +// ph.addNode("127.0.0.1", 30303, 30303); startedForwarder = true; @@ -239,13 +239,13 @@ BOOST_AUTO_TEST_CASE(asyncforwarding) this_thread::sleep_for(chrono::milliseconds(50)); { - Host ph("Sender", NetworkPreferences(50300, "", false, true)); + Host ph("Sender", NetworkPreferences(30300, "", 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.addNode("127.0.0.1", 50305, 50305); +// ph.addNode("127.0.0.1", 30305, 30305); KeyPair us = KeyPair::create(); wh->post(us.sec(), RLPStream().append(1).out(), BuildTopic("test")); @@ -253,13 +253,13 @@ BOOST_AUTO_TEST_CASE(asyncforwarding) } { - Host ph("Listener", NetworkPreferences(50300, "", false, true)); + Host ph("Listener", NetworkPreferences(30300, "", 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.addNode("127.0.0.1", 50305, 50305); +// ph.addNode("127.0.0.1", 30305, 30305); /// Only interested in odd packets auto w = wh->installWatch(BuildTopicMask("test")); |