Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Remove GRAPHENE_MAX_NESTED_OBJECTS

Browse source
This commit is contained in:
Srdjan Obucina 2019-09-10 14:26:48 +02:00
parent e0a7172b04
commit c206466b31
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/app/config_util.cpp
View file

@ -150,8 +150,8 @@ static fc::optional<fc::logging_config> load_logging_config_from_ini_file(const
console_appender_config.level_colors.emplace_back( console_appender_config.level_colors.emplace_back(
fc::console_appender::level_color(fc::log_level::error, fc::console_appender::level_color(fc::log_level::error,
fc::console_appender::color::cyan)); fc::console_appender::color::cyan));
console_appender_config.stream = fc::variant(stream_name).as<fc::console_appender::stream::type>(GRAPHENE_MAX_NESTED_OBJECTS); console_appender_config.stream = fc::variant(stream_name).as<fc::console_appender::stream::type>();
logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config, GRAPHENE_MAX_NESTED_OBJECTS))); logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config)));
found_logging_config = true; found_logging_config = true;
} }
else if (boost::starts_with(section_name, file_appender_section_prefix)) else if (boost::starts_with(section_name, file_appender_section_prefix))
@ -172,7 +172,7 @@ static fc::optional<fc::logging_config> load_logging_config_from_ini_file(const
file_appender_config.rotate = true; file_appender_config.rotate = true;
file_appender_config.rotation_interval = fc::minutes(interval); file_appender_config.rotation_interval = fc::minutes(interval);
file_appender_config.rotation_limit = fc::days(limit); file_appender_config.rotation_limit = fc::days(limit);
logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config, GRAPHENE_MAX_NESTED_OBJECTS))); logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config)));
found_logging_config = true; found_logging_config = true;
} }
else if (boost::starts_with(section_name, logger_section_prefix)) else if (boost::starts_with(section_name, logger_section_prefix))

2
libraries/chain/include/graphene/chain/config.hpp
View file

@ -53,8 +53,6 @@
#define GRAPHENE_MIN_UNDO_HISTORY 10 #define GRAPHENE_MIN_UNDO_HISTORY 10
#define GRAPHENE_MAX_UNDO_HISTORY 10000 #define GRAPHENE_MAX_UNDO_HISTORY 10000
#define GRAPHENE_MAX_NESTED_OBJECTS (200)
#define GRAPHENE_MIN_BLOCK_SIZE_LIMIT (GRAPHENE_MIN_TRANSACTION_SIZE_LIMIT*5) // 5 transactions per block #define GRAPHENE_MIN_BLOCK_SIZE_LIMIT (GRAPHENE_MIN_TRANSACTION_SIZE_LIMIT*5) // 5 transactions per block
#define GRAPHENE_MIN_TRANSACTION_EXPIRATION_LIMIT (GRAPHENE_MAX_BLOCK_INTERVAL * 5) // 5 transactions per block #define GRAPHENE_MIN_TRANSACTION_EXPIRATION_LIMIT (GRAPHENE_MAX_BLOCK_INTERVAL * 5) // 5 transactions per block
#define GRAPHENE_BLOCKCHAIN_PRECISION uint64_t( 100000 ) #define GRAPHENE_BLOCKCHAIN_PRECISION uint64_t( 100000 )