1 files changed, 106 insertions, 26 deletions
diff --git a/tests/unit_tests/test_format_utils.cpp b/tests/unit_tests/test_format_utils.cpp
index dfc05f55a..4dd877591 100644
--- a/tests/unit_tests/test_format_utils.cpp
+++ b/tests/unit_tests/test_format_utils.cpp
@@ -4,52 +4,132 @@
 
 #include "gtest/gtest.h"
 
+#include <vector>
+
 #include "common/util.h"
 #include "cryptonote_core/cryptonote_format_utils.h"
 
-TEST(parse_and_validate_tx_extra, is_correct_parse_and_validate_tx_extra)
+
+TEST(parse_tx_extra, handles_empty_extra)
+{
+  std::vector<uint8_t> extra;;
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_TRUE(cryptonote::parse_tx_extra(extra, tx_extra_fields));
+  ASSERT_TRUE(tx_extra_fields.empty());
+}
+
+TEST(parse_tx_extra, handles_padding_only_size_1)
+{
+  const uint8_t extra_arr[] = {0};
+  std::vector<uint8_t> extra(&extra_arr[0], &extra_arr[0] + sizeof(extra_arr));
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_TRUE(cryptonote::parse_tx_extra(extra, tx_extra_fields));
+  ASSERT_EQ(1, tx_extra_fields.size());
+  ASSERT_EQ(typeid(cryptonote::tx_extra_padding), tx_extra_fields[0].type());
+  ASSERT_EQ(1, boost::get<cryptonote::tx_extra_padding>(tx_extra_fields[0]).size);
+}
+
+TEST(parse_tx_extra, handles_padding_only_size_2)
+{
+  const uint8_t extra_arr[] = {0, 0};
+  std::vector<uint8_t> extra(&extra_arr[0], &extra_arr[0] + sizeof(extra_arr));
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_TRUE(cryptonote::parse_tx_extra(extra, tx_extra_fields));
+  ASSERT_EQ(1, tx_extra_fields.size());
+  ASSERT_EQ(typeid(cryptonote::tx_extra_padding), tx_extra_fields[0].type());
+  ASSERT_EQ(2, boost::get<cryptonote::tx_extra_padding>(tx_extra_fields[0]).size);
+}
+
+TEST(parse_tx_extra, handles_padding_only_max_size)
+{
+  std::vector<uint8_t> extra(TX_EXTRA_NONCE_MAX_COUNT, 0);
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_TRUE(cryptonote::parse_tx_extra(extra, tx_extra_fields));
+  ASSERT_EQ(1, tx_extra_fields.size());
+  ASSERT_EQ(typeid(cryptonote::tx_extra_padding), tx_extra_fields[0].type());
+  ASSERT_EQ(TX_EXTRA_NONCE_MAX_COUNT, boost::get<cryptonote::tx_extra_padding>(tx_extra_fields[0]).size);
+}
+
+TEST(parse_tx_extra, handles_padding_only_exceed_max_size)
+{
+  std::vector<uint8_t> extra(TX_EXTRA_NONCE_MAX_COUNT + 1, 0);
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_FALSE(cryptonote::parse_tx_extra(extra, tx_extra_fields));
+}
+
+TEST(parse_tx_extra, handles_invalid_padding_only)
+{
+  std::vector<uint8_t> extra(2, 0);
+  extra[1] = 42;
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_FALSE(cryptonote::parse_tx_extra(extra, tx_extra_fields));
+}
+
+TEST(parse_tx_extra, handles_pub_key_only)
+{
+  const uint8_t extra_arr[] = {1, 30, 208, 98, 162, 133, 64, 85, 83, 112, 91, 188, 89, 211, 24, 131, 39, 154, 22, 228,
+    80, 63, 198, 141, 173, 111, 244, 183, 4, 149, 186, 140, 230};
+  std::vector<uint8_t> extra(&extra_arr[0], &extra_arr[0] + sizeof(extra_arr));
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_TRUE(cryptonote::parse_tx_extra(extra, tx_extra_fields));
+  ASSERT_EQ(1, tx_extra_fields.size());
+  ASSERT_EQ(typeid(cryptonote::tx_extra_pub_key), tx_extra_fields[0].type());
+}
+
+TEST(parse_tx_extra, handles_extra_nonce_only)
+{
+  const uint8_t extra_arr[] = {2, 1, 42};
+  std::vector<uint8_t> extra(&extra_arr[0], &extra_arr[0] + sizeof(extra_arr));
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_TRUE(cryptonote::parse_tx_extra(extra, tx_extra_fields));
+  ASSERT_EQ(1, tx_extra_fields.size());
+  ASSERT_EQ(typeid(cryptonote::tx_extra_nonce), tx_extra_fields[0].type());
+  cryptonote::tx_extra_nonce extra_nonce = boost::get<cryptonote::tx_extra_nonce>(tx_extra_fields[0]);
+  ASSERT_EQ(1, extra_nonce.nonce.size());
+  ASSERT_EQ(42, extra_nonce.nonce[0]);
+}
+
+TEST(parse_tx_extra, handles_pub_key_and_padding)
+{
+  const uint8_t extra_arr[] = {1, 30, 208, 98, 162, 133, 64, 85, 83, 112, 91, 188, 89, 211, 24, 131, 39, 154, 22, 228,
+    80, 63, 198, 141, 173, 111, 244, 183, 4, 149, 186, 140, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+  std::vector<uint8_t> extra(&extra_arr[0], &extra_arr[0] + sizeof(extra_arr));
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_TRUE(cryptonote::parse_tx_extra(extra, tx_extra_fields));
+  ASSERT_EQ(2, tx_extra_fields.size());
+  ASSERT_EQ(typeid(cryptonote::tx_extra_pub_key), tx_extra_fields[0].type());
+  ASSERT_EQ(typeid(cryptonote::tx_extra_padding), tx_extra_fields[1].type());
+}
+
+TEST(parse_and_validate_tx_extra, is_valid_tx_extra_parsed)
 {
   cryptonote::transaction tx = AUTO_VAL_INIT(tx);
   cryptonote::account_base acc;
   acc.generate();
   cryptonote::blobdata b = "dsdsdfsdfsf";
-  bool r = cryptonote::construct_miner_tx(0, 0, 10000000000000, 1000, DEFAULT_FEE, acc.get_keys().m_account_address, tx, b, 1);
-  ASSERT_TRUE(r);
-  crypto::public_key tx_pub_key;
-  r = cryptonote::parse_and_validate_tx_extra(tx, tx_pub_key);
-  ASSERT_TRUE(r);
+  ASSERT_TRUE(cryptonote::construct_miner_tx(0, 0, 10000000000000, 1000, DEFAULT_FEE, acc.get_keys().m_account_address, tx, b, 1));
+  crypto::public_key tx_pub_key = cryptonote::get_tx_pub_key_from_extra(tx);
+  ASSERT_NE(tx_pub_key, cryptonote::null_pkey);
 }
-TEST(parse_and_validate_tx_extra, is_correct_extranonce_too_big)
+TEST(parse_and_validate_tx_extra, fails_on_big_extra_nonce)
 {
   cryptonote::transaction tx = AUTO_VAL_INIT(tx);
   cryptonote::account_base acc;
   acc.generate();
-  cryptonote::blobdata b(260, 0);
-  bool r = cryptonote::construct_miner_tx(0, 0, 10000000000000, 1000, DEFAULT_FEE, acc.get_keys().m_account_address, tx, b, 1);
-  ASSERT_FALSE(r);
+  cryptonote::blobdata b(TX_EXTRA_NONCE_MAX_COUNT + 1, 0);
+  ASSERT_FALSE(cryptonote::construct_miner_tx(0, 0, 10000000000000, 1000, DEFAULT_FEE, acc.get_keys().m_account_address, tx, b, 1));
 }
-TEST(parse_and_validate_tx_extra, is_correct_wrong_extra_couner_too_big)
+TEST(parse_and_validate_tx_extra, fails_on_wrong_size_in_extra_nonce)
 {
   cryptonote::transaction tx = AUTO_VAL_INIT(tx);
   tx.extra.resize(20, 0);
   tx.extra[0] = TX_EXTRA_NONCE;
   tx.extra[1] = 255;
-  crypto::public_key tx_pub_key;
-  bool r = parse_and_validate_tx_extra(tx, tx_pub_key);
-  ASSERT_FALSE(r);
+  std::vector<cryptonote::tx_extra_field> tx_extra_fields;
+  ASSERT_FALSE(cryptonote::parse_tx_extra(tx.extra, tx_extra_fields));
 }
-TEST(parse_and_validate_tx_extra, is_correct_wrong_extra_nonce_double_entry)
-{
-  cryptonote::transaction tx = AUTO_VAL_INIT(tx);
-  tx.extra.resize(20, 0);
-  cryptonote::blobdata v = "asasdasd";
-  cryptonote::add_tx_extra_nonce(tx, v);
-  cryptonote::add_tx_extra_nonce(tx, v);
-  crypto::public_key tx_pub_key;
-  bool r = parse_and_validate_tx_extra(tx, tx_pub_key);
-  ASSERT_FALSE(r);
-}
-
 TEST(validate_parse_amount_case, validate_parse_amount)
 {
   uint64_t res = 0;