From 2212cfe95b86f68aea1e2022074504cd07a24470 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 17 Aug 2015 15:00:59 -0400 Subject: [PATCH] config.hpp: Remove unused constants GRAPHENE_DEFAULT_NUM_WITNESSES, GRAPHENE_DEFAULT_NUM_COMMITTEE --- libraries/chain/get_config.cpp | 2 -- libraries/chain/include/graphene/chain/config.hpp | 2 -- libraries/chain/include/graphene/chain/genesis_state.hpp | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/chain/get_config.cpp b/libraries/chain/get_config.cpp index 61f84f52..ada12de2 100644 --- a/libraries/chain/get_config.cpp +++ b/libraries/chain/get_config.cpp @@ -71,8 +71,6 @@ fc::variant_object get_config() result[ "GRAPHENE_DEFAULT_MAINTENANCE_COLLATERAL_RATIO" ] = GRAPHENE_DEFAULT_MAINTENANCE_COLLATERAL_RATIO; result[ "GRAPHENE_DEFAULT_MAX_SHORT_SQUEEZE_RATIO" ] = GRAPHENE_DEFAULT_MAX_SHORT_SQUEEZE_RATIO; result[ "GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC" ] = GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC; - result[ "GRAPHENE_DEFAULT_NUM_WITNESSES" ] = GRAPHENE_DEFAULT_NUM_WITNESSES; - result[ "GRAPHENE_DEFAULT_NUM_COMMITTEE" ] = GRAPHENE_DEFAULT_NUM_COMMITTEE; result[ "GRAPHENE_DEFAULT_MAX_WITNESSES" ] = GRAPHENE_DEFAULT_MAX_WITNESSES; result[ "GRAPHENE_DEFAULT_MAX_COMMITTEE" ] = GRAPHENE_DEFAULT_MAX_COMMITTEE; result[ "GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC" ] = GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC; diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index ac482b89..f77f7144 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -85,8 +85,6 @@ ///@} #define GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC (30*60*60*24) -#define GRAPHENE_DEFAULT_NUM_WITNESSES (101) -#define GRAPHENE_DEFAULT_NUM_COMMITTEE (11) #define GRAPHENE_DEFAULT_MIN_WITNESS_COUNT (11) #define GRAPHENE_DEFAULT_MIN_COMMITTEE_MEMBER_COUNT (11) #define GRAPHENE_DEFAULT_MAX_WITNESSES (1001) // SHOULD BE ODD diff --git a/libraries/chain/include/graphene/chain/genesis_state.hpp b/libraries/chain/include/graphene/chain/genesis_state.hpp index fafd3017..5780acdc 100644 --- a/libraries/chain/include/graphene/chain/genesis_state.hpp +++ b/libraries/chain/include/graphene/chain/genesis_state.hpp @@ -84,7 +84,7 @@ struct genesis_state_type { vector initial_assets; vector initial_balances; vector initial_vesting_balances; - uint64_t initial_active_witnesses = GRAPHENE_DEFAULT_NUM_WITNESSES; + uint64_t initial_active_witnesses; vector initial_witness_candidates; vector initial_committee_candidates; vector initial_worker_candidates;