From 6f5762f0c15890eba7b49eb6489668b6e25e2a56 Mon Sep 17 00:00:00 2001
From: sowle <crypto.sowle@gmail.com>
Date: Fri, 9 Aug 2019 07:34:27 +0300
Subject: [PATCH] coretests: generic improvements in chaingen

---
 tests/core_tests/chaingen.cpp        | 4 ++--
 tests/core_tests/chaingen.h          | 2 +-
 tests/core_tests/checkpoints_tests.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/core_tests/chaingen.cpp b/tests/core_tests/chaingen.cpp
index 37efabaa..430f2d6f 100644
--- a/tests/core_tests/chaingen.cpp
+++ b/tests/core_tests/chaingen.cpp
@@ -1504,14 +1504,14 @@ bool construct_tx_to_key(const std::vector<test_event_entry>& events,
   if (!fill_tx_sources(sources, events, blk_head, from.get_keys(), spending_amount, nmix, check_for_spends, check_for_unlocktime, use_ref_by_id))
     return false;
 
-  int64_t change = get_sources_total_amount(sources);
+  boost::multiprecision::int128_t change = get_sources_total_amount(sources);
   change -= spending_amount;
   if (change < 0)
     return false; // should never happen if fill_tx_sources succeded
   if (change == 0)
     return construct_tx(from.get_keys(), sources, destinations, extr, att, tx, sk, 0, mix_attr);
   std::vector<tx_destination_entry> local_dst = destinations;
-  local_dst.push_back(tx_destination_entry(change, from.get_public_address()));
+  local_dst.push_back(tx_destination_entry(change.convert_to<uint64_t>(), from.get_public_address()));
   return construct_tx(from.get_keys(), sources, local_dst, extr, att, tx, sk, 0, mix_attr);
 }
 
diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h
index 7ebeb817..27e1deec 100644
--- a/tests/core_tests/chaingen.h
+++ b/tests/core_tests/chaingen.h
@@ -247,7 +247,7 @@ struct offers_count_param
   size_t offers_count_raw;
 };
 
-class test_chain_unit_enchanced : public test_chain_unit_base
+class test_chain_unit_enchanced : virtual public test_chain_unit_base
 {
 public:
   test_chain_unit_enchanced();
diff --git a/tests/core_tests/checkpoints_tests.h b/tests/core_tests/checkpoints_tests.h
index 43950877..64e5b69d 100644
--- a/tests/core_tests/checkpoints_tests.h
+++ b/tests/core_tests/checkpoints_tests.h
@@ -7,7 +7,7 @@
 #include "chaingen.h"
 #include "random_helper.h"
 
-struct checkpoints_test : public test_chain_unit_enchanced
+struct checkpoints_test : virtual public test_chain_unit_enchanced
 {
   checkpoints_test();