tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

carrot_core: fix unit tests for payment_id_t type separation

Browse Source
This commit is contained in:
jeffro256
2025-05-19 15:37:27 -05:00
committed by akildemir
parent bd34433be2
commit d1b7abfc69
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit_tests/carrot_core.cpp
+6 -6
View File
@@ -132,7 +132,7 @@ TEST(carrot_core, main_address_normal_scan_completeness)
crypto::public_key recovered_address_spend_pubkey; crypto::public_key recovered_address_spend_pubkey;
rct::xmr_amount recovered_amount; rct::xmr_amount recovered_amount;
crypto::secret_key recovered_amount_blinding_factor; crypto::secret_key recovered_amount_blinding_factor;
encrypted_payment_id_t recovered_payment_id; payment_id_t recovered_payment_id;
CarrotEnoteType recovered_enote_type; CarrotEnoteType recovered_enote_type;
const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote, const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote,
encrypted_payment_id, encrypted_payment_id,
@@ -202,7 +202,7 @@ TEST(carrot_core, subaddress_normal_scan_completeness)
crypto::public_key recovered_address_spend_pubkey; crypto::public_key recovered_address_spend_pubkey;
rct::xmr_amount recovered_amount; rct::xmr_amount recovered_amount;
crypto::secret_key recovered_amount_blinding_factor; crypto::secret_key recovered_amount_blinding_factor;
encrypted_payment_id_t recovered_payment_id; payment_id_t recovered_payment_id;
CarrotEnoteType recovered_enote_type; CarrotEnoteType recovered_enote_type;
const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote, const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote,
encrypted_payment_id, encrypted_payment_id,
@@ -269,7 +269,7 @@ TEST(carrot_core, integrated_address_normal_scan_completeness)
crypto::public_key recovered_address_spend_pubkey; crypto::public_key recovered_address_spend_pubkey;
rct::xmr_amount recovered_amount; rct::xmr_amount recovered_amount;
crypto::secret_key recovered_amount_blinding_factor; crypto::secret_key recovered_amount_blinding_factor;
encrypted_payment_id_t recovered_payment_id; payment_id_t recovered_payment_id;
CarrotEnoteType recovered_enote_type; CarrotEnoteType recovered_enote_type;
const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote, const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote,
encrypted_payment_id, encrypted_payment_id,
@@ -340,7 +340,7 @@ TEST(carrot_core, main_address_special_scan_completeness)
crypto::public_key recovered_address_spend_pubkey; crypto::public_key recovered_address_spend_pubkey;
rct::xmr_amount recovered_amount; rct::xmr_amount recovered_amount;
crypto::secret_key recovered_amount_blinding_factor; crypto::secret_key recovered_amount_blinding_factor;
encrypted_payment_id_t recovered_payment_id; payment_id_t recovered_payment_id;
CarrotEnoteType recovered_enote_type; CarrotEnoteType recovered_enote_type;
const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote, const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote,
std::nullopt, std::nullopt,
@@ -417,7 +417,7 @@ TEST(carrot_core, subaddress_special_scan_completeness)
crypto::public_key recovered_address_spend_pubkey; crypto::public_key recovered_address_spend_pubkey;
rct::xmr_amount recovered_amount; rct::xmr_amount recovered_amount;
crypto::secret_key recovered_amount_blinding_factor; crypto::secret_key recovered_amount_blinding_factor;
encrypted_payment_id_t recovered_payment_id; payment_id_t recovered_payment_id;
CarrotEnoteType recovered_enote_type; CarrotEnoteType recovered_enote_type;
const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote, const bool scan_success = try_scan_carrot_enote_external_receiver(enote_proposal.enote,
std::nullopt, std::nullopt,
@@ -705,7 +705,7 @@ static void subtest_2out_transfer_get_output_enote_proposals_completeness(const
// calculate dummy encrypted pid // calculate dummy encrypted pid
const std::optional<encrypted_payment_id_t> dummy_encrypted_pid = bob_integrated const std::optional<encrypted_payment_id_t> dummy_encrypted_pid = bob_integrated
? std::optional<encrypted_payment_id_t>{} ? std::optional<encrypted_payment_id_t>{}
: gen_payment_id(); : gen_encrypted_payment_id();
// turn payment proposals into enotes, passing dummy pid_enc if bob isn't integrated // turn payment proposals into enotes, passing dummy pid_enc if bob isn't integrated
std::vector<RCTOutputEnoteProposal> enote_proposals; std::vector<RCTOutputEnoteProposal> enote_proposals;
tests/unit_tests/carrot_legacy.cpp
+1 -1
View File
@@ -189,7 +189,7 @@ static void subtest_legacy_2out_transfer_get_output_enote_proposals_completeness
encrypted_payment_id_t encrypted_payment_id; encrypted_payment_id_t encrypted_payment_id;
get_output_enote_proposals({bob_payment_proposal}, get_output_enote_proposals({bob_payment_proposal},
{alice_payment_proposal}, {alice_payment_proposal},
gen_payment_id(), gen_encrypted_payment_id(),
nullptr, nullptr,
&alive_k_v_dev, &alive_k_v_dev,
tx_first_key_image, tx_first_key_image,