rebase fixes

UkoeHB · Aug 2, 2024 · 81d0ffc · 81d0ffc
1 parent d2edf42
commit 81d0ffc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/serialization/crypto.h b/src/serialization/crypto.h
@@ -90,7 +90,7 @@ BLOB_SERIALIZER(crypto::signature);
 BLOB_SERIALIZER(crypto::view_tag);
 BLOB_SERIALIZER(crypto::x25519_pubkey);
 BLOB_SERIALIZER(crypto::x25519_scalar);
-BLOB_SERIALIZER(crypto::x25519_secret_key);
+BLOB_SERIALIZER_FORCED(crypto::x25519_secret_key);
 VARIANT_TAG(debug_archive, crypto::hash, "hash");
 VARIANT_TAG(debug_archive, crypto::hash8, "hash8");
 VARIANT_TAG(debug_archive, crypto::public_key, "public_key");
@@ -101,6 +101,7 @@ VARIANT_TAG(debug_archive, crypto::signature, "signature");
 VARIANT_TAG(debug_archive, crypto::view_tag, "view_tag");
 VARIANT_TAG(debug_archive, crypto::x25519_pubkey, "x25519_pubkey");
 VARIANT_TAG(debug_archive, crypto::x25519_scalar, "x25519_scalar");
+VARIANT_TAG(debug_archive, crypto::x25519_secret_key, "x25519_secret_key");
 
 VARIANT_TAG(binary_archive, crypto::x25519_pubkey, 0xb1);
 VARIANT_TAG(binary_archive, crypto::x25519_scalar, 0xb2);
diff --git a/tests/core_tests/enote_scanning.cpp b/tests/core_tests/enote_scanning.cpp
@@ -121,7 +121,19 @@ bool gen_enote_tx_validation_base::generate_with_full(std::vector<test_event_ent
   std::vector<crypto::secret_key> additional_tx_keys;
   std::unordered_map<crypto::public_key, cryptonote::subaddress_index> subaddresses;
   subaddresses[miner_account.get_keys().m_account_address.m_spend_public_key] = {0,0};
-  bool r = construct_tx_and_get_tx_key(miner_account.get_keys(), subaddresses, sources, destinations, cryptonote::account_public_address{}, std::vector<uint8_t>(), tx, 0, tx_key, additional_tx_keys, use_rct, rct_config, use_view_tags);
+  bool r = construct_tx_and_get_tx_key(
+    miner_account.get_keys(),
+    subaddresses,
+    sources,
+    destinations,
+    cryptonote::account_public_address{},
+    std::vector<uint8_t>(),
+    tx,
+    tx_key,
+    additional_tx_keys,
+    use_rct,
+    rct_config,
+    use_view_tags);
   CHECK_AND_ASSERT_MES(r, false, "failed to construct transaction");
 
   if (post_tx && !post_tx(tx))

diff --git a/tests/functional_tests/wallet_scanner.cpp b/tests/functional_tests/wallet_scanner.cpp
@@ -195,7 +195,7 @@ void WalletScannerTest::transfer(const std::size_t wallet_idx,
     dsts.push_back(de);
 
     std::vector<tools::wallet2::pending_tx> ptx;
-    ptx = this->wallet(wallet_idx)->create_transactions_2(dsts, FAKE_OUTS_COUNT, 0, 0, std::vector<uint8_t>(), 0, {});
+    ptx = this->wallet(wallet_idx)->create_transactions_2(dsts, FAKE_OUTS_COUNT, 0, std::vector<uint8_t>(), 0, {});
     CHECK_AND_ASSERT_THROW_MES(ptx.size() == 1, "unexpected num pending txs");
     this->wallet(wallet_idx)->commit_tx(ptx[0]);
 
@@ -426,7 +426,6 @@ ExpectedScanResults WalletScannerTest::init_sweep_single_test()
             false /*is_subaddress*/,
             1 /*outputs*/,
             FAKE_OUTS_COUNT,
-            0 /*unlock_time*/,
             0 /*priority*/,
             std::vector<uint8_t>() /*extra*/
         );
@@ -525,7 +524,7 @@ ExpectedScanResults WalletScannerTest::init_multiple_subaddresses_test()
         }
 
         std::vector<tools::wallet2::pending_tx> ptx;
-        ptx = sendr_wallet->create_transactions_2(dsts, FAKE_OUTS_COUNT, 0, 0, std::vector<uint8_t>(), 0, {});
+        ptx = sendr_wallet->create_transactions_2(dsts, FAKE_OUTS_COUNT, 0, std::vector<uint8_t>(), 0, {});
         CHECK_AND_ASSERT_THROW_MES(ptx.size() == 1, "unexpected num pending txs");
         sendr_wallet->commit_tx(ptx[0]);
 

diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt
@@ -54,7 +54,6 @@ set(unit_tests_sources
   epee_serialization.cpp
   epee_utils.cpp
   expect.cpp
-  fee.cpp
   grootle.cpp
   json_serialization.cpp
   get_xtype_from_string.cpp