diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a155ccd..aa36b0bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,6 @@ add_executable (test rai/test/wallet_test.cpp rai/test/daemon.cpp rai/test/uint256_union.cpp - rai/test/bulk_req_initiator.cpp ) add_executable (qt_test diff --git a/rai/core/core.cpp b/rai/core/core.cpp index b9f9e41d..a9b2ee79 100644 --- a/rai/core/core.cpp +++ b/rai/core/core.cpp @@ -49,7 +49,7 @@ namespace } bool constexpr log_to_cerr () { - return true; + return false; } } @@ -2506,22 +2506,22 @@ void rai::bulk_req_initiator::received_type (boost::system::error_code const & e { case rai::block_type::send: { - boost::asio::async_read (connection->socket, boost::asio::buffer (receive_buffer.data () + 1, 64 + 32 + 32 + 32), [this_l] (boost::system::error_code const & ec, size_t size_a) {this_l->received_block (ec, size_a);}); + boost::asio::async_read (connection->socket, boost::asio::buffer (receive_buffer.data () + 1, sizeof (rai::signature) + sizeof (rai::block_hash) + sizeof (rai::amount) + sizeof (rai::address)), [this_l] (boost::system::error_code const & ec, size_t size_a) {this_l->received_block (ec, size_a);}); break; } case rai::block_type::receive: { - boost::asio::async_read (connection->socket, boost::asio::buffer (receive_buffer.data () + 1, 64 + 32 + 32), [this_l] (boost::system::error_code const & ec, size_t size_a) {this_l->received_block (ec, size_a);}); + boost::asio::async_read (connection->socket, boost::asio::buffer (receive_buffer.data () + 1, sizeof (rai::signature) + sizeof (rai::block_hash) + sizeof (rai::block_hash)), [this_l] (boost::system::error_code const & ec, size_t size_a) {this_l->received_block (ec, size_a);}); break; } case rai::block_type::open: { - boost::asio::async_read (connection->socket, boost::asio::buffer (receive_buffer.data () + 1, 32 + 32 + 64), [this_l] (boost::system::error_code const & ec, size_t size_a) {this_l->received_block (ec, size_a);}); + boost::asio::async_read (connection->socket, boost::asio::buffer (receive_buffer.data () + 1, sizeof (rai::signature) + sizeof (rai::block_hash) + sizeof (rai::address)), [this_l] (boost::system::error_code const & ec, size_t size_a) {this_l->received_block (ec, size_a);}); break; } case rai::block_type::change: { - boost::asio::async_read (connection->socket, boost::asio::buffer (receive_buffer.data () + 1, 32 + 32 + 64), [this_l] (boost::system::error_code const & ec, size_t size_a) {this_l->received_block (ec, size_a);}); + boost::asio::async_read (connection->socket, boost::asio::buffer (receive_buffer.data () + 1, sizeof (rai::signature) + sizeof (rai::block_hash) + sizeof (rai::address)), [this_l] (boost::system::error_code const & ec, size_t size_a) {this_l->received_block (ec, size_a);}); break; } case rai::block_type::not_a_block: diff --git a/rai/test/bulk_req_initiator.cpp b/rai/test/bulk_req_initiator.cpp deleted file mode 100644 index b47bd144..00000000 --- a/rai/test/bulk_req_initiator.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include - -TEST (bulk_req_initiator, receive_send) -{ - -} \ No newline at end of file diff --git a/rai/test/client.cpp b/rai/test/client.cpp index 27324d6f..db5f67e5 100644 --- a/rai/test/client.cpp +++ b/rai/test/client.cpp @@ -87,7 +87,7 @@ TEST (client, send_single_many_peers) system.service->poll_one (); system.processor.poll_one (); ++iterations; - ASSERT_LT (iterations, 200); + ASSERT_LT (iterations, 2000); } } @@ -158,7 +158,7 @@ TEST (client, auto_bootstrap_reverse) system.service->poll_one (); system.processor.poll_one (); ++iterations; - ASSERT_LT (iterations, 20); + ASSERT_LT (iterations, 200); } while (client1->ledger.account_balance (key2.pub) != 100); } diff --git a/rai/test/ledger.cpp b/rai/test/ledger.cpp index 7ba43cab..cb0c416a 100644 --- a/rai/test/ledger.cpp +++ b/rai/test/ledger.cpp @@ -676,7 +676,7 @@ TEST (system, generate_send_existing) ASSERT_FALSE (system.clients [0]->store.latest_get (rai::test_genesis_key.pub, frontier2)); ASSERT_NE (frontier1.hash, frontier2.hash); auto iterations1 (0); - while (system.clients [0]->ledger.account_balance (rai::test_genesis_key.pub) == std::numeric_limits ::max ()) + while (system.clients [0]->ledger.account_balance (rai::test_genesis_key.pub) == std::numeric_limits ::max ()) { system.service->poll_one (); system.processor.poll_one (); @@ -684,7 +684,7 @@ TEST (system, generate_send_existing) ASSERT_LT (iterations1, 20); } auto iterations2 (0); - while (system.clients [0]->ledger.account_balance (rai::test_genesis_key.pub) != std::numeric_limits ::max ()) + while (system.clients [0]->ledger.account_balance (rai::test_genesis_key.pub) != std::numeric_limits ::max ()) { system.service->poll_one (); system.processor.poll_one (); diff --git a/rai/test/test_network.cpp b/rai/test/test_network.cpp index 310205fe..53dd1386 100644 --- a/rai/test/test_network.cpp +++ b/rai/test/test_network.cpp @@ -846,7 +846,7 @@ TEST (bootstrap_processor, process_one) { system.service->poll_one (); ++iterations; - ASSERT_LT (iterations, 20); + ASSERT_LT (iterations, 200); } auto hash3 (client1->ledger.latest (rai::test_genesis_key.pub)); ASSERT_EQ (hash1, hash3); @@ -874,7 +874,7 @@ TEST (bootstrap_processor, process_two) { system.service->run_one (); ++iterations; - ASSERT_LT (iterations, 20); + ASSERT_LT (iterations, 200); } auto hash4 (client1->ledger.latest (rai::test_genesis_key.pub)); ASSERT_EQ (hash3, hash4); @@ -893,7 +893,7 @@ TEST (bootstrap_processor, process_new) system.service->poll_one (); system.processor.poll_one (); ++iterations1; - ASSERT_LT (iterations1, 20); + ASSERT_LT (iterations1, 200); } auto balance1 (system.clients [0]->ledger.account_balance (rai::test_genesis_key.pub)); auto balance2 (system.clients [0]->ledger.account_balance (key2.pub)); @@ -904,10 +904,10 @@ TEST (bootstrap_processor, process_new) auto iterations2 (0); while (client1->ledger.account_balance (key2.pub) != balance2) { - system.service->run_one (); + system.service->poll_one (); system.processor.poll_one (); ++iterations2; - ASSERT_LT (iterations2, 20); + ASSERT_LT (iterations2, 200); } ASSERT_EQ (balance1, client1->ledger.account_balance (rai::test_genesis_key.pub)); }