diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-15 15:19:54 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-15 15:19:54 +0200 |
| commit | ce5367452063e4e74e8a690d876274b9395eef69 (patch) | |
| tree | 447161d53d5f86eb435df8b924dfeeca18373c2b /tests | |
| parent | Merge pull request #1066 (diff) | |
| parent | wallet: fix misdetection of duplicates (diff) | |
| download | monero-ce5367452063e4e74e8a690d876274b9395eef69.tar.xz | |
Merge pull request #1067
70b78bb wallet: fix misdetection of duplicates (moneromooo-monero)
7d413f6 rct: rework serialization to avoid storing vector sizes (moneromooo-monero)
0ce79ef core: cleanup some typecasting (moneromooo-monero)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit_tests/serialization.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/unit_tests/serialization.cpp b/tests/unit_tests/serialization.cpp index 40209f6ed..f51f9ec67 100644 --- a/tests/unit_tests/serialization.cpp +++ b/tests/unit_tests/serialization.cpp @@ -589,6 +589,7 @@ TEST(Serialization, serializes_ringct_types) ASSERT_TRUE(serialization::parse_binary(blob, rg1)); ASSERT_TRUE(!memcmp(&rg0, &rg1, sizeof(rg0))); +#if 0 ASSERT_TRUE(serialization::dump_binary(s0, blob)); ASSERT_TRUE(serialization::parse_binary(blob, s1)); ASSERT_TRUE(s0.type == s1.type); @@ -621,16 +622,18 @@ TEST(Serialization, serializes_ringct_types) // serialization only does the mask ASSERT_TRUE(!memcmp(&s0.outPk[n].mask, &s1.outPk[n].mask, sizeof(s0.outPk[n].mask))); } +#endif tx0.set_null(); tx0.version = 2; cryptonote::txin_to_key txin_to_key1; - txin_to_key1.key_offsets.resize(2); + txin_to_key1.key_offsets.resize(4); cryptonote::txin_to_key txin_to_key2; - txin_to_key2.key_offsets.resize(2); + txin_to_key2.key_offsets.resize(4); tx0.vin.push_back(txin_to_key1); tx0.vin.push_back(txin_to_key2); tx0.vout.push_back(cryptonote::tx_out()); + tx0.vout.push_back(cryptonote::tx_out()); tx0.rct_signatures = s0; ASSERT_EQ(tx0.rct_signatures.p.rangeSigs.size(), 2); ASSERT_TRUE(serialization::dump_binary(tx0, blob)); |