From b94e2f536d69b7736d91824d6dd2ede1e236b06b Mon Sep 17 00:00:00 2001 From: sowle Date: Sun, 9 Apr 2023 18:22:20 +0200 Subject: [PATCH] ml2s tests excluded from *; some warnings fixed --- src/rpc/core_rpc_server.cpp | 6 ++++-- tests/functional_tests/crypto_tests.cpp | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 0dd8b111..37893382 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -363,10 +363,12 @@ namespace currency } res.status = API_RETURN_CODE_OK; + + /* std::stringstream ss; typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount outs_for_amount; typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::out_entry out_entry; - /*std::for_each(res.outs.begin(), res.outs.end(), [&](outs_for_amount& ofa) + std::for_each(res.outs.begin(), res.outs.end(), [&](outs_for_amount& ofa) { ss << "[" << ofa.amount << "]:"; CHECK_AND_ASSERT_MES(ofa.outs.size(), ;, "internal error: ofa.outs.size() is empty for amount " << ofa.amount); @@ -379,7 +381,7 @@ namespace currency std::string s = ss.str(); LOG_PRINT_L2("COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS: " << ENDL << s); */ - res.status = API_RETURN_CODE_OK; + return true; } //------------------------------------------------------------------------------------------------------------------------------ diff --git a/tests/functional_tests/crypto_tests.cpp b/tests/functional_tests/crypto_tests.cpp index 2e3799ba..fa6fae72 100644 --- a/tests/functional_tests/crypto_tests.cpp +++ b/tests/functional_tests/crypto_tests.cpp @@ -5,6 +5,7 @@ #define USE_INSECURE_RANDOM_RPNG_ROUTINES // turns on random manupulation for tests #include +#include #include "crypto/crypto.h" #include "epee/include/misc_log_ex.h" #include "epee/include/profile_tools.h" @@ -491,7 +492,7 @@ struct test_keeper_t //////////////////////////////////////////////////////////////////////////////// -#include "crypto_tests_ml2s.h" +// #include "crypto_tests_ml2s.h" #include "crypto_tests_range_proofs.h" #include "crypto_tests_clsag.h" #include "crypto_tests_one_out_of_many_proofs.h"