diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-04-14 14:22:39 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-04-14 14:22:39 +0800 |
| commit | 2560af3a1da5162063c19817fdbd8e64bf6d4e42 (patch) | |
| tree | b1b32eb216b9501e0b089cdd6f722a7b1692950d /net.cpp | |
| parent | b848fa9af1487c3cfcc35d4ff24a6c48b0c79d06 (diff) | |
| download | dexon-solidity-2560af3a1da5162063c19817fdbd8e64bf6d4e42.tar dexon-solidity-2560af3a1da5162063c19817fdbd8e64bf6d4e42.tar.gz dexon-solidity-2560af3a1da5162063c19817fdbd8e64bf6d4e42.tar.bz2 dexon-solidity-2560af3a1da5162063c19817fdbd8e64bf6d4e42.tar.lz dexon-solidity-2560af3a1da5162063c19817fdbd8e64bf6d4e42.tar.xz dexon-solidity-2560af3a1da5162063c19817fdbd8e64bf6d4e42.tar.zst dexon-solidity-2560af3a1da5162063c19817fdbd8e64bf6d4e42.zip | |
cleanup/prep endpoint semantics for #1558 and #1557
Diffstat (limited to 'net.cpp')
| -rw-r--r-- | net.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -32,7 +32,13 @@ using namespace dev::p2p; namespace ba = boost::asio; namespace bi = ba::ip; -BOOST_AUTO_TEST_SUITE(net) +struct NetFixture +{ + NetFixture() { dev::p2p::NodeIPEndpoint::test_allowLocal = true;; } + ~NetFixture() { dev::p2p::NodeIPEndpoint::test_allowLocal = false; } +}; + +BOOST_FIXTURE_TEST_SUITE(net, NetFixture) /** * Only used for testing. Not useful beyond tests. @@ -53,7 +59,7 @@ protected: struct TestNodeTable: public NodeTable { /// Constructor - TestNodeTable(ba::io_service& _io, KeyPair _alias, bi::address const& _addr, uint16_t _port = 30300): NodeTable(_io, _alias, _addr, _port) {} + TestNodeTable(ba::io_service& _io, KeyPair _alias, bi::address const& _addr, uint16_t _port = 30300): NodeTable(_io, _alias, NodeIPEndpoint(_addr, _port, _port)) {} static std::vector<std::pair<KeyPair,unsigned>> createTestNodes(unsigned _count) { @@ -93,7 +99,7 @@ struct TestNodeTable: public NodeTable // manually add node for test { Guard ln(x_nodes); - shared_ptr<NodeEntry> node(new NodeEntry(m_node, n.first.pub(), NodeIPEndpoint(bi::udp::endpoint(ourIp, n.second), bi::tcp::endpoint(ourIp, n.second)))); + shared_ptr<NodeEntry> node(new NodeEntry(m_node, n.first.pub(), NodeIPEndpoint(ourIp, n.second, n.second))); node->pending = false; m_nodes[node->id] = node; } @@ -201,7 +207,7 @@ BOOST_AUTO_TEST_CASE(test_neighbours_packet) { Neighbours::Node node; node.ipAddress = boost::asio::ip::address::from_string("127.0.0.1").to_string(); - node.port = n.second; + node.udpPort = n.second; node.node = n.first.pub(); out.nodes.push_back(node); } @@ -213,7 +219,7 @@ BOOST_AUTO_TEST_CASE(test_neighbours_packet) int count = 0; for (auto n: in.nodes) { - BOOST_REQUIRE_EQUAL(testNodes[count].second, n.port); + BOOST_REQUIRE_EQUAL(testNodes[count].second, n.udpPort); BOOST_REQUIRE_EQUAL(testNodes[count].first.pub(), n.node); BOOST_REQUIRE_EQUAL(sha3(testNodes[count].first.pub()), sha3(n.node)); count++; |