diff --git a/tests/unit_tests/carrot_sparc.cpp b/tests/unit_tests/carrot_sparc.cpp index ece82cc..12f362e 100644 --- a/tests/unit_tests/carrot_sparc.cpp +++ b/tests/unit_tests/carrot_sparc.cpp @@ -162,7 +162,7 @@ std::tuple, crypto::public_key> make_return_ crypto::public_key recovered_address_spend_pubkey; rct::xmr_amount recovered_amount; crypto::secret_key recovered_amount_blinding_factor; - encrypted_payment_id_t recovered_payment_id; + payment_id_t recovered_payment_id; CarrotEnoteType recovered_enote_type; const bool scan_success = try_scan_carrot_enote_external_receiver( received_output, diff --git a/tests/unit_tests/wallet_tx_builder.cpp b/tests/unit_tests/wallet_tx_builder.cpp index 991f47b..0248bbf 100644 --- a/tests/unit_tests/wallet_tx_builder.cpp +++ b/tests/unit_tests/wallet_tx_builder.cpp @@ -711,22 +711,22 @@ TEST(wallet_tx_builder, make_carrot_transaction_proposals_wallet2_sweep_6) // ASSERT_EQ(2, alice.m_transfers.size()); // ASSERT_EQ(amount0 + amount1, alice.balance_all(true)); // really, we care about unlocked_balance_all() for sending, but that call uses RPC - // 6. - LOG_PRINT_L2("Alice feels pity on Bob and proposes to send his broke ass some dough"); - const rct::xmr_amount out_amount = rct::randXmrAmount(amount0 + amount1); - const std::vector tx_proposals = - tools::wallet::make_carrot_transaction_proposals_wallet2_transfer( // stupidly long function name ;( - alice.m_transfers, - alice.m_subaddresses, - {cryptonote::tx_destination_entry(out_amount, bob_main_addr, false)}, - /*fee_per_weight=*/1, - /*extra=*/{}, - /*subaddr_account=*/0, - /*subaddr_indices=*/{}, - /*ignore_above=*/std::numeric_limits::max(), - /*ignore_below=*/0, - {}, - /*top_block_index=*/bc.height()-1); + // // 6. + // LOG_PRINT_L2("Alice feels pity on Bob and proposes to send his broke ass some dough"); + // const rct::xmr_amount out_amount = rct::randXmrAmount(amount0 + amount1); + // const std::vector tx_proposals = + // tools::wallet::make_carrot_transaction_proposals_wallet2_transfer( // stupidly long function name ;( + // alice.m_transfers, + // alice.m_subaddresses, + // {cryptonote::tx_destination_entry(out_amount, bob_main_addr, false)}, + // /*fee_per_weight=*/1, + // /*extra=*/{}, + // /*subaddr_account=*/0, + // /*subaddr_indices=*/{}, + // /*ignore_above=*/std::numeric_limits::max(), + // /*ignore_below=*/0, + // {}, + // /*top_block_index=*/bc.height()-1); // ASSERT_EQ(1, tx_proposals.size()); // const carrot::CarrotTransactionProposalV1 tx_proposal = tx_proposals.at(0);