diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2016-07-28 20:14:15 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2016-08-28 21:30:01 +0100 |
| commit | b337aea6cce707152143750e14b956a8ae40390f (patch) | |
| tree | 3dd973f9af16b912c02f632100b9f8172d21c8aa | |
| parent | core_tests: fix a couple pre-rct tests using rct (diff) | |
| download | monero-b337aea6cce707152143750e14b956a8ae40390f.tar.xz | |
rct: do not serialize senderPk - it is not used anymore
| -rw-r--r-- | src/cryptonote_core/cryptonote_boost_serialization.h | 2 | ||||
| -rw-r--r-- | src/ringct/rctTypes.h | 2 | ||||
| -rw-r--r-- | tests/unit_tests/serialization.cpp | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/cryptonote_core/cryptonote_boost_serialization.h b/src/cryptonote_core/cryptonote_boost_serialization.h index 81f5f081a..f222db94e 100644 --- a/src/cryptonote_core/cryptonote_boost_serialization.h +++ b/src/cryptonote_core/cryptonote_boost_serialization.h @@ -219,7 +219,7 @@ namespace boost { a & x.mask; a & x.amount; - a & x.senderPk; + // a & x.senderPk; // not serialized, as we do not use it in monero currently } inline void serializeOutPk(boost::archive::binary_iarchive &a, rct::ctkeyV &outPk_, const boost::serialization::version_type ver) diff --git a/src/ringct/rctTypes.h b/src/ringct/rctTypes.h index d36d3f1b1..1ba280aba 100644 --- a/src/ringct/rctTypes.h +++ b/src/ringct/rctTypes.h @@ -116,7 +116,7 @@ namespace rct { BEGIN_SERIALIZE_OBJECT() FIELD(mask) FIELD(amount) - FIELD(senderPk) + // FIELD(senderPk) // not serialized, as we do not use it in monero currently END_SERIALIZE() }; diff --git a/tests/unit_tests/serialization.cpp b/tests/unit_tests/serialization.cpp index 0a53aeae0..0da23c0d2 100644 --- a/tests/unit_tests/serialization.cpp +++ b/tests/unit_tests/serialization.cpp @@ -532,7 +532,9 @@ TEST(Serialization, serializes_ringct_types) ecdh0.senderPk = rct::skGen(); ASSERT_TRUE(serialization::dump_binary(ecdh0, blob)); ASSERT_TRUE(serialization::parse_binary(blob, ecdh1)); - ASSERT_TRUE(!memcmp(&ecdh0, &ecdh1, sizeof(ecdh0))); + ASSERT_TRUE(!memcmp(&ecdh0.mask, &ecdh1.mask, sizeof(ecdh0.mask))); + ASSERT_TRUE(!memcmp(&ecdh0.amount, &ecdh1.amount, sizeof(ecdh0.amount))); + // senderPk is not serialized for (size_t n = 0; n < 64; ++n) { |