From 976ed481d0710d07b211f8e75555195c3cddf2da Mon Sep 17 00:00:00 2001
From: sowle <crypto.sowle@gmail.com>
Date: Wed, 1 May 2019 16:01:10 +0200
Subject: [PATCH] coretests adapted for serializable_pair

---
 tests/core_tests/alias_tests.cpp      | 4 ++--
 tests/core_tests/block_validation.cpp | 4 ++--
 tests/core_tests/double_spend.h       | 2 +-
 tests/core_tests/double_spend.inl     | 2 +-
 tests/core_tests/integer_overflow.cpp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/core_tests/alias_tests.cpp b/tests/core_tests/alias_tests.cpp
index 168f8f29..ac974d0a 100644
--- a/tests/core_tests/alias_tests.cpp
+++ b/tests/core_tests/alias_tests.cpp
@@ -922,7 +922,7 @@ bool gen_alias_reg_with_locked_money::generate(std::vector<test_event_entry>& ev
 
   currency::tx_source_entry se = AUTO_VAL_INIT(se);
   se.amount = blk_0.miner_tx.vout[0].amount;
-  se.outputs.push_back(std::make_pair(0, boost::get<currency::txout_to_key>(blk_0.miner_tx.vout[0].target).key));
+  se.outputs.push_back(make_serializable_pair<txout_v, crypto::public_key>(0, boost::get<currency::txout_to_key>(blk_0.miner_tx.vout[0].target).key));
   se.real_output = 0;
   se.real_output_in_tx_index = 0;
   se.real_out_tx_key = currency::get_tx_pub_key_from_extra(blk_0.miner_tx);
@@ -1192,7 +1192,7 @@ bool gen_alias_tx_no_outs::generate(std::vector<test_event_entry>& events) const
 
   currency::tx_source_entry se = AUTO_VAL_INIT(se);
   se.amount = blk_0.miner_tx.vout[0].amount;
-  se.outputs.push_back(std::make_pair(0, boost::get<currency::txout_to_key>(blk_0.miner_tx.vout[0].target).key));
+  se.outputs.push_back(make_serializable_pair<txout_v, crypto::public_key>(0, boost::get<currency::txout_to_key>(blk_0.miner_tx.vout[0].target).key));
   se.real_output = 0;
   se.real_output_in_tx_index = 0;
   se.real_out_tx_key = currency::get_tx_pub_key_from_extra(blk_0.miner_tx);
diff --git a/tests/core_tests/block_validation.cpp b/tests/core_tests/block_validation.cpp
index 1b2a8a99..d01b65c8 100644
--- a/tests/core_tests/block_validation.cpp
+++ b/tests/core_tests/block_validation.cpp
@@ -312,7 +312,7 @@ bool gen_block_miner_tx_has_2_in::generate(std::vector<test_event_entry>& events
 
   tx_source_entry se = AUTO_VAL_INIT(se);
   se.amount = blk_0.miner_tx.vout[0].amount;
-  se.outputs.push_back(std::make_pair(0, boost::get<txout_to_key>(blk_0.miner_tx.vout[0].target).key));
+  se.outputs.push_back(make_serializable_pair<txout_v, crypto::public_key>(0, boost::get<txout_to_key>(blk_0.miner_tx.vout[0].target).key));
   se.real_output = 0;
   se.real_out_tx_key = get_tx_pub_key_from_extra(blk_0.miner_tx);
   se.real_output_in_tx_index = 0;
@@ -355,7 +355,7 @@ bool gen_block_miner_tx_with_txin_to_key::generate(std::vector<test_event_entry>
 
   tx_source_entry se = AUTO_VAL_INIT(se);
   se.amount = blk_1.miner_tx.vout[0].amount;
-  se.outputs.push_back(std::make_pair(0, boost::get<txout_to_key>(blk_1.miner_tx.vout[0].target).key));
+  se.outputs.push_back(make_serializable_pair<txout_v, crypto::public_key>(0, boost::get<txout_to_key>(blk_1.miner_tx.vout[0].target).key));
   se.real_output = 0;
   se.real_out_tx_key = get_tx_pub_key_from_extra(blk_1.miner_tx);
   se.real_output_in_tx_index = 0;
diff --git a/tests/core_tests/double_spend.h b/tests/core_tests/double_spend.h
index 6da861cc..3ca9ba9d 100644
--- a/tests/core_tests/double_spend.h
+++ b/tests/core_tests/double_spend.h
@@ -92,7 +92,7 @@ struct gen_double_spend_in_alt_chain_in_different_blocks : public gen_double_spe
 class gen_double_spend_in_different_chains : public test_chain_unit_base
 {
 public:
-  static const uint64_t send_amount = MK_TEST_COINS(TESTS_DEFAULT_FEE*10);
+  static const uint64_t send_amount = MK_TEST_COINS(10);
   static const size_t expected_blockchain_height = 4 + 2 * CURRENCY_MINED_MONEY_UNLOCK_WINDOW;
 
   gen_double_spend_in_different_chains();
diff --git a/tests/core_tests/double_spend.inl b/tests/core_tests/double_spend.inl
index 1a92374d..57ab653e 100644
--- a/tests/core_tests/double_spend.inl
+++ b/tests/core_tests/double_spend.inl
@@ -80,7 +80,7 @@ bool gen_double_spend_in_tx<txs_kept_by_block>::generate(std::vector<test_event_
   uint64_t global_out_index = 0;
   bool r = find_global_index_for_output(events, get_block_hash(blk_1r), tx_0, se.real_output_in_tx_index, global_out_index);
   CHECK_AND_ASSERT_MES(r, false, "find_global_index_for_output failed");
-  se.outputs.push_back(std::make_pair(global_out_index, boost::get<currency::txout_to_key>(tx_0.vout[se.real_output_in_tx_index].target).key));
+  se.outputs.push_back(make_serializable_pair<currency::txout_v, crypto::public_key>(global_out_index, boost::get<currency::txout_to_key>(tx_0.vout[se.real_output_in_tx_index].target).key));
   se.real_output = 0;
   se.real_out_tx_key = get_tx_pub_key_from_extra(tx_0);
   sources.push_back(se);
diff --git a/tests/core_tests/integer_overflow.cpp b/tests/core_tests/integer_overflow.cpp
index bd6e590f..cf71c954 100644
--- a/tests/core_tests/integer_overflow.cpp
+++ b/tests/core_tests/integer_overflow.cpp
@@ -36,7 +36,7 @@ namespace
   {
     currency::tx_source_entry se = AUTO_VAL_INIT(se);
     se.amount = tx.vout[out_idx].amount;
-    se.outputs.push_back(std::make_pair(0, boost::get<currency::txout_to_key>(tx.vout[out_idx].target).key));
+    se.outputs.push_back(make_serializable_pair<txout_v, crypto::public_key>(0, boost::get<currency::txout_to_key>(tx.vout[out_idx].target).key));
     se.real_output = 0;
     se.real_out_tx_key = get_tx_pub_key_from_extra(tx);
     se.real_output_in_tx_index = out_idx;