diff options
| -rw-r--r-- | src/cryptonote_basic/cryptonote_boost_serialization.h | 1 | ||||
| -rw-r--r-- | src/ringct/rctTypes.h | 3 | ||||
| -rw-r--r-- | tests/unit_tests/device.cpp | 2 | ||||
| -rw-r--r-- | tests/unit_tests/serialization.cpp | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/src/cryptonote_basic/cryptonote_boost_serialization.h b/src/cryptonote_basic/cryptonote_boost_serialization.h index 8a527b898..a4228b849 100644 --- a/src/cryptonote_basic/cryptonote_boost_serialization.h +++ b/src/cryptonote_basic/cryptonote_boost_serialization.h @@ -262,7 +262,6 @@ namespace boost memset(&x.amount, 0, sizeof(x.amount)); } a & amount; - // a & x.senderPk; // not serialized, as we do not use it in monero currently } template <class Archive> diff --git a/src/ringct/rctTypes.h b/src/ringct/rctTypes.h index a02c338e9..50d0f4d91 100644 --- a/src/ringct/rctTypes.h +++ b/src/ringct/rctTypes.h @@ -120,17 +120,14 @@ namespace rct { // If the pedersen commitment to an amount is C = aG + bH, // "mask" contains a 32 byte key a // "amount" contains a hex representation (in 32 bytes) of a 64 bit number - // "senderPk" is not the senders actual public key, but a one-time public key generated for // the purpose of the ECDH exchange struct ecdhTuple { key mask; key amount; - key senderPk; BEGIN_SERIALIZE_OBJECT() FIELD(mask) // not saved from v2 BPs FIELD(amount) - // FIELD(senderPk) // not serialized, as we do not use it in monero currently END_SERIALIZE() }; diff --git a/tests/unit_tests/device.cpp b/tests/unit_tests/device.cpp index 064a7028e..c0e8fecc1 100644 --- a/tests/unit_tests/device.cpp +++ b/tests/unit_tests/device.cpp @@ -121,12 +121,10 @@ TEST(device, ecdh32) rct::key key = rct::skGen(); tuple.mask = rct::skGen(); tuple.amount = rct::skGen(); - tuple.senderPk = rct::pkGen(); tuple2 = tuple; dev.ecdhEncode(tuple, key, false); dev.ecdhDecode(tuple, key, false); ASSERT_EQ(tuple2.mask, tuple.mask); ASSERT_EQ(tuple2.amount, tuple.amount); - ASSERT_EQ(tuple2.senderPk, tuple.senderPk); } diff --git a/tests/unit_tests/serialization.cpp b/tests/unit_tests/serialization.cpp index 1592f805e..343a11c37 100644 --- a/tests/unit_tests/serialization.cpp +++ b/tests/unit_tests/serialization.cpp @@ -550,12 +550,10 @@ TEST(Serialization, serializes_ringct_types) ecdh0.mask = rct::skGen(); ecdh0.amount = rct::skGen(); - ecdh0.senderPk = rct::skGen(); ASSERT_TRUE(serialization::dump_binary(ecdh0, blob)); ASSERT_TRUE(serialization::parse_binary(blob, ecdh1)); 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) { |