diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-11-06 14:52:24 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-11-06 14:52:24 +0200 |
| commit | 236c0dd48cf130d28eeb9f39d6410abe2a6bfc8b (patch) | |
| tree | 8becdac0d6c6089b8a0ec9a264f5edcd64599245 /tests | |
| parent | 267b5d88076e628560248995ab3c979469b67616 (diff) | |
| parent | 5f614ba968388ae231579c392f8e793d569b9b3d (diff) | |
| download | monzero-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')
| -rw-r--r-- | tests/data/fuzz/cold-outputs/OUTPUTS2 | bin | 256 -> 581 bytes | |||
| -rw-r--r-- | tests/fuzz/cold-outputs.cpp | 2 | ||||
| -rw-r--r-- | tests/unit_tests/serialization.cpp | 13 |
3 files changed, 13 insertions, 2 deletions
diff --git a/tests/data/fuzz/cold-outputs/OUTPUTS2 b/tests/data/fuzz/cold-outputs/OUTPUTS2 Binary files differindex 907bcdb91..33cf39024 100644 --- a/tests/data/fuzz/cold-outputs/OUTPUTS2 +++ b/tests/data/fuzz/cold-outputs/OUTPUTS2 diff --git a/tests/fuzz/cold-outputs.cpp b/tests/fuzz/cold-outputs.cpp index 488a3b931..29b3ed267 100644 --- a/tests/fuzz/cold-outputs.cpp +++ b/tests/fuzz/cold-outputs.cpp @@ -77,7 +77,7 @@ int ColdOutputsFuzzer::run(const std::string &filename) s = std::string("\x01\x16serialization::archive") + s; try { - std::vector<tools::wallet2::transfer_details> outputs; + std::pair<size_t, std::vector<tools::wallet2::transfer_details>> outputs; std::stringstream iss; iss << s; boost::archive::portable_binary_iarchive ar(iss); 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 |