From 149a22bee131b62ea214385c422439e3847c77c0 Mon Sep 17 00:00:00 2001 From: jeffro256 Date: Sat, 19 Apr 2025 21:26:12 -0500 Subject: [PATCH] carrot_core: refactor from tools:variant -> std::variant --- src/carrot_core/lazy_amount_commitment.cpp | 2 +- src/carrot_core/lazy_amount_commitment.h | 4 ++-- src/carrot_core/output_set_finalization.cpp | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/carrot_core/lazy_amount_commitment.cpp b/src/carrot_core/lazy_amount_commitment.cpp index 2f421a863..a99aff02c 100644 --- a/src/carrot_core/lazy_amount_commitment.cpp +++ b/src/carrot_core/lazy_amount_commitment.cpp @@ -52,7 +52,7 @@ rct::key calculate_amount_commitment(const lazy_amount_commitment_t &lazy_amount rct::key operator()(const rct::xmr_amount &a) const { return rct::zeroCommit(a); } }; - return lazy_amount_commitment.visit(lazy_amount_commitment_visitor{}); + return std::visit(lazy_amount_commitment_visitor{}, lazy_amount_commitment); } //------------------------------------------------------------------------------------------------------------------- } //namespace carrot diff --git a/src/carrot_core/lazy_amount_commitment.h b/src/carrot_core/lazy_amount_commitment.h index b1ecf8ebd..a39405af1 100644 --- a/src/carrot_core/lazy_amount_commitment.h +++ b/src/carrot_core/lazy_amount_commitment.h @@ -29,20 +29,20 @@ #pragma once //local headers -#include "common/variant.h" #include "ringct/rctTypes.h" //third party headers //standard headers #include +#include //forward declarations namespace carrot { -using lazy_amount_commitment_t = tools::variant< +using lazy_amount_commitment_t = std::variant< rct::key, // C std::pair, // (a, z) s.t. C = z G + a H rct::xmr_amount // a s.t. C = G + a H diff --git a/src/carrot_core/output_set_finalization.cpp b/src/carrot_core/output_set_finalization.cpp index 1aef870a1..ec120ebf1 100644 --- a/src/carrot_core/output_set_finalization.cpp +++ b/src/carrot_core/output_set_finalization.cpp @@ -193,9 +193,6 @@ void get_output_enote_proposals(const std::vector &norm CHECK_AND_ASSERT_THROW_MES(has_unique_randomness, "get output enote proposals: normal payment proposals contain duplicate anchor_norm AKA randomness"); - // input_context = "R" || KI_1 - const input_context_t input_context= make_carrot_input_context(tx_first_key_image); - // construct normal enotes output_enote_proposals_out.reserve(num_proposals); for (size_t i = 0; i < normal_payment_proposals.size(); ++i) @@ -327,9 +324,6 @@ void get_coinbase_output_enotes(const std::vector &norm CHECK_AND_ASSERT_THROW_MES(has_unique_randomness, "get coinbase output enotes: normal payment proposals contain duplicate anchor_norm AKA randomness"); - // input_context = "C" || IntToBytes256(block_index) - const input_context_t input_context = make_carrot_input_context_coinbase(block_index); - // construct normal enotes output_coinbase_enotes_out.reserve(num_proposals); for (size_t i = 0; i < normal_payment_proposals.size(); ++i)