aboutsummaryrefslogtreecommitdiff
path: root/tests/unit_tests
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-11-06 14:52:24 +0200
committerRiccardo Spagni <ric@spagni.net>2018-11-06 14:52:24 +0200
commit236c0dd48cf130d28eeb9f39d6410abe2a6bfc8b (patch)
tree8becdac0d6c6089b8a0ec9a264f5edcd64599245 /tests/unit_tests
parent267b5d88076e628560248995ab3c979469b67616 (diff)
parent5f614ba968388ae231579c392f8e793d569b9b3d (diff)
downloadmonzero-core-236c0dd48cf130d28eeb9f39d6410abe2a6bfc8b.tar.gz
monzero-core-236c0dd48cf130d28eeb9f39d6410abe2a6bfc8b.tar.xz
monzero-core-236c0dd48cf130d28eeb9f39d6410abe2a6bfc8b.zip
Merge pull request #4720
5f614ba9 simplewallet: print the number of show/all transfers (moneromooo-monero) 8d71b2b1 wallet2: only export necessary outputs and key images (moneromooo-monero) 769ae42a wallet2: faster output and key image import/export (moneromooo-monero)
Diffstat (limited to 'tests/unit_tests')
-rw-r--r--tests/unit_tests/serialization.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/unit_tests/serialization.cpp b/tests/unit_tests/serialization.cpp
index 2f7b5aac7..b4517af2f 100644
--- a/tests/unit_tests/serialization.cpp
+++ b/tests/unit_tests/serialization.cpp
@@ -908,6 +908,17 @@ TEST(Serialization, portability_outputs)
ASSERT_TRUE(td2.m_pk_index == 0);
}
+struct unsigned_tx_set
+{
+ std::vector<tools::wallet2::tx_construction_data> txes;
+ tools::wallet2::transfer_container transfers;
+};
+template <class Archive>
+inline void serialize(Archive &a, unsigned_tx_set &x, const boost::serialization::version_type ver)
+{
+ a & x.txes;
+ a & x.transfers;
+}
#define UNSIGNED_TX_PREFIX "Monero unsigned tx set\003"
TEST(Serialization, portability_unsigned_tx)
{
@@ -918,7 +929,7 @@ TEST(Serialization, portability_unsigned_tx)
ASSERT_TRUE(r);
const size_t magiclen = strlen(UNSIGNED_TX_PREFIX);
ASSERT_FALSE(strncmp(s.c_str(), UNSIGNED_TX_PREFIX, magiclen));
- tools::wallet2::unsigned_tx_set exported_txs;
+ unsigned_tx_set exported_txs;
s = s.substr(magiclen);
r = false;
try