Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

minor fixes (epee namespace, warnings)

Browse source
This commit is contained in:
sowle 2022-05-11 21:02:06 +02:00
parent bbf2530cca
commit 7df157520d
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/crypto/RIPEMD160_helper.cpp
View file

@ -1,9 +1,6 @@
// Copyright (c) 2020 The Zano developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#pragma once
#include "RIPEMD160_helper.h"
#include "auto_val_init.h"
extern "C" {

6
tests/core_tests/chaingen.h
View file

@ -777,8 +777,8 @@ bool construct_broken_tx(const currency::account_keys& sender_account_keys, cons
if (!(in_ephemeral.pub == src_entr.outputs[src_entr.real_output].second))
{
LOG_ERROR("derived public key missmatch with output public key! " << ENDL << "derived_key:"
<< string_tools::pod_to_hex(in_ephemeral.pub) << ENDL << "real output_public_key:"
<< string_tools::pod_to_hex(src_entr.outputs[src_entr.real_output].second));
<< epst::pod_to_hex(in_ephemeral.pub) << ENDL << "real output_public_key:"
<< epst::pod_to_hex(src_entr.outputs[src_entr.real_output].second));
return false;
}
@ -979,7 +979,7 @@ void append_vector_by_another_vector(U& dst, const V& src)
{ \
callback_entry ce = AUTO_VAL_INIT(ce); \
ce.callback_name = CB_NAME; \
ce.callback_params = epee::string_tools::pod_to_hex(PARAMS_POD_OBJ); \
ce.callback_params = epst::pod_to_hex(PARAMS_POD_OBJ); \
VEC_EVENTS.push_back(ce); \
PRINT_EVENT_NO(VEC_EVENTS); \
}

6
tests/core_tests/chaingen_helpers.h
View file

@ -199,13 +199,13 @@ struct log_level_scope_changer
{
log_level_scope_changer(int desired_log_level)
{
m_original_log_level = log_space::get_set_log_detalisation_level();
log_space::get_set_log_detalisation_level(true, desired_log_level);
m_original_log_level = epee::log_space::get_set_log_detalisation_level();
epee::log_space::get_set_log_detalisation_level(true, desired_log_level);
}
~log_level_scope_changer()
{
log_space::get_set_log_detalisation_level(true, m_original_log_level);
epee::log_space::get_set_log_detalisation_level(true, m_original_log_level);
}
int m_original_log_level;

2
tests/unit_tests/wallet_seed_test.cpp
View file

@ -193,7 +193,9 @@ TEST(wallet_seed, basic_test)
if (r)
{
if (wse.timestamp)
{
ASSERT_EQ(wse.timestamp, acc.get_createtime());
}
ASSERT_EQ(wse.auditable, acc.get_public_address().is_auditable());