From c206466b3138ffbe05dbbb982808e7316a7adda6 Mon Sep 17 00:00:00 2001 From: Srdjan Obucina Date: Tue, 10 Sep 2019 14:26:48 +0200 Subject: [PATCH] Remove GRAPHENE_MAX_NESTED_OBJECTS --- libraries/app/config_util.cpp | 6 +++--- libraries/chain/include/graphene/chain/config.hpp | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libraries/app/config_util.cpp b/libraries/app/config_util.cpp index a3d8d78c..6ae750a5 100644 --- a/libraries/app/config_util.cpp +++ b/libraries/app/config_util.cpp @@ -150,8 +150,8 @@ static fc::optional load_logging_config_from_ini_file(const console_appender_config.level_colors.emplace_back( fc::console_appender::level_color(fc::log_level::error, fc::console_appender::color::cyan)); - console_appender_config.stream = fc::variant(stream_name).as(GRAPHENE_MAX_NESTED_OBJECTS); - logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config, GRAPHENE_MAX_NESTED_OBJECTS))); + console_appender_config.stream = fc::variant(stream_name).as(); + logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config))); found_logging_config = true; } else if (boost::starts_with(section_name, file_appender_section_prefix)) @@ -172,7 +172,7 @@ static fc::optional load_logging_config_from_ini_file(const file_appender_config.rotate = true; file_appender_config.rotation_interval = fc::minutes(interval); 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; } else if (boost::starts_with(section_name, logger_section_prefix)) diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 0c91765d..becf73d6 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -53,8 +53,6 @@ #define GRAPHENE_MIN_UNDO_HISTORY 10 #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_TRANSACTION_EXPIRATION_LIMIT (GRAPHENE_MAX_BLOCK_INTERVAL * 5) // 5 transactions per block #define GRAPHENE_BLOCKCHAIN_PRECISION uint64_t( 100000 )