5 files changed, 104 insertions, 0 deletions
diff --git a/tests/core_proxy/core_proxy.cpp b/tests/core_proxy/core_proxy.cpp
index c12b8e9a7..366937e1d 100644
--- a/tests/core_proxy/core_proxy.cpp
+++ b/tests/core_proxy/core_proxy.cpp
@@ -185,6 +185,19 @@ bool tests::proxy_core::handle_incoming_tx(const cryptonote::blobdata& tx_blob,
     return true;
 }
 
+bool tests::proxy_core::handle_incoming_txs(const std::list<blobdata>& tx_blobs, std::vector<tx_verification_context>& tvc, bool keeped_by_block, bool relayed, bool do_not_relay)
+{
+    tvc.resize(tx_blobs.size());
+    size_t i = 0;
+    for (const auto &tx_blob: tx_blobs)
+    {
+      if (!handle_incoming_tx(tx_blob, tvc[i], keeped_by_block, relayed, do_not_relay))
+          return false;
+      ++i;
+    }
+    return true;
+}
+
 bool tests::proxy_core::handle_incoming_block(const cryptonote::blobdata& block_blob, cryptonote::block_verification_context& bvc, bool update_miner_blocktemplate) {
     block b = AUTO_VAL_INIT(b);
 
diff --git a/tests/core_proxy/core_proxy.h b/tests/core_proxy/core_proxy.h
index 58645edb5..35e88081b 100644
--- a/tests/core_proxy/core_proxy.h
+++ b/tests/core_proxy/core_proxy.h
@@ -75,6 +75,7 @@ namespace tests
     bool have_block(const crypto::hash& id);
     bool get_blockchain_top(uint64_t& height, crypto::hash& top_id);
     bool handle_incoming_tx(const cryptonote::blobdata& tx_blob, cryptonote::tx_verification_context& tvc, bool keeped_by_block, bool relayed, bool do_not_relay);
+    bool handle_incoming_txs(const std::list<cryptonote::blobdata>& tx_blobs, std::vector<cryptonote::tx_verification_context>& tvc, bool keeped_by_block, bool relayed, bool do_not_relay);
     bool handle_incoming_block(const cryptonote::blobdata& block_blob, cryptonote::block_verification_context& bvc, bool update_miner_blocktemplate = true);
     void pause_mine(){}
     void resume_mine(){}
diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt
index da95a97a9..2f62dc2aa 100644
--- a/tests/unit_tests/CMakeLists.txt
+++ b/tests/unit_tests/CMakeLists.txt
@@ -31,6 +31,7 @@ set(unit_tests_sources
   ban.cpp
   base58.cpp
   blockchain_db.cpp
+  block_queue.cpp
   block_reward.cpp
   canonical_amounts.cpp
   chacha8.cpp
@@ -72,6 +73,7 @@ add_executable(unit_tests
 target_link_libraries(unit_tests
   PRIVATE
     ringct
+    cryptonote_protocol
     cryptonote_core
     blockchain_db
     rpc
diff --git a/tests/unit_tests/ban.cpp b/tests/unit_tests/ban.cpp
index 432d5bbf3..694d733ec 100644
--- a/tests/unit_tests/ban.cpp
+++ b/tests/unit_tests/ban.cpp
@@ -52,6 +52,7 @@ public:
   bool have_block(const crypto::hash& id) const {return true;}
   bool get_blockchain_top(uint64_t& height, crypto::hash& top_id)const{height=0;top_id=cryptonote::null_hash;return true;}
   bool handle_incoming_tx(const cryptonote::blobdata& tx_blob, cryptonote::tx_verification_context& tvc, bool keeped_by_block, bool relayed, bool do_not_relay) { return true; }
+  bool handle_incoming_txs(const std::list<cryptonote::blobdata>& tx_blob, std::vector<cryptonote::tx_verification_context>& tvc, bool keeped_by_block, bool relayed, bool do_not_relay) { return true; }
   bool handle_incoming_block(const cryptonote::blobdata& block_blob, cryptonote::block_verification_context& bvc, bool update_miner_blocktemplate = true) { return true; }
   void pause_mine(){}
   void resume_mine(){}
diff --git a/tests/unit_tests/block_queue.cpp b/tests/unit_tests/block_queue.cpp
new file mode 100644
index 000000000..f05d5487a
--- /dev/null
+++ b/tests/unit_tests/block_queue.cpp
@@ -0,0 +1,87 @@
+// Copyright (c) 2017, The Monero Project
+// 
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+// 
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+// 
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+// 
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <boost/uuid/uuid.hpp>
+#include "gtest/gtest.h"
+#include "crypto/crypto.h"
+#include "cryptonote_protocol/cryptonote_protocol_defs.h"
+#include "cryptonote_protocol/block_queue.h"
+
+static const boost::uuids::uuid &uuid1()
+{
+  static const boost::uuids::uuid uuid = crypto::rand<boost::uuids::uuid>();
+  return uuid;
+}
+
+static const boost::uuids::uuid &uuid2()
+{
+  static const boost::uuids::uuid uuid = crypto::rand<boost::uuids::uuid>();
+  return uuid;
+}
+
+TEST(block_queue, empty)
+{
+  cryptonote::block_queue bq;
+  ASSERT_EQ(bq.get_max_block_height(), 0);
+}
+
+TEST(block_queue, add_stepwise)
+{
+  cryptonote::block_queue bq;
+  bq.add_blocks(0, 200, uuid1());
+  ASSERT_EQ(bq.get_max_block_height(), 199);
+  bq.add_blocks(200, 200, uuid1());
+  ASSERT_EQ(bq.get_max_block_height(), 399);
+  bq.add_blocks(401, 200, uuid1());
+  ASSERT_EQ(bq.get_max_block_height(), 600);
+  bq.add_blocks(400, 10, uuid1());
+  ASSERT_EQ(bq.get_max_block_height(), 600);
+}
+
+TEST(block_queue, flush_uuid)
+{
+  cryptonote::block_queue bq;
+
+  bq.add_blocks(0, 200, uuid1());
+  ASSERT_EQ(bq.get_max_block_height(), 199);
+  bq.add_blocks(200, 200, uuid2());
+  ASSERT_EQ(bq.get_max_block_height(), 399);
+  bq.flush_spans(uuid2());
+  ASSERT_EQ(bq.get_max_block_height(), 199);
+  bq.flush_spans(uuid1());
+  ASSERT_EQ(bq.get_max_block_height(), 0);
+
+  bq.add_blocks(0, 200, uuid1());
+  ASSERT_EQ(bq.get_max_block_height(), 199);
+  bq.add_blocks(200, 200, uuid2());
+  ASSERT_EQ(bq.get_max_block_height(), 399);
+  bq.flush_spans(uuid1());
+  ASSERT_EQ(bq.get_max_block_height(), 399);
+  bq.add_blocks(0, 200, uuid1());
+  ASSERT_EQ(bq.get_max_block_height(), 399);
+}