From 29b7f343a69e9b6f121986e87913b5c12501e889 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 17 Aug 2015 13:14:03 -0400 Subject: [PATCH] Remove chain_id from global_property_object --- libraries/chain/db_init.cpp | 1 - .../chain/include/graphene/chain/global_property_object.hpp | 3 --- 2 files changed, 4 deletions(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index e043588f..edc7c65f 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -307,7 +307,6 @@ void database::init_genesis(const genesis_state_type& genesis_state) // Create global properties create([&](global_property_object& p) { - p.chain_id = chain_id; p.parameters = genesis_state.initial_parameters; // Set fees to zero initially, so that genesis initialization needs not pay them // We'll fix it at the end of the function diff --git a/libraries/chain/include/graphene/chain/global_property_object.hpp b/libraries/chain/include/graphene/chain/global_property_object.hpp index 2771ffcc..dacb5ce2 100644 --- a/libraries/chain/include/graphene/chain/global_property_object.hpp +++ b/libraries/chain/include/graphene/chain/global_property_object.hpp @@ -47,8 +47,6 @@ namespace graphene { namespace chain { flat_set active_witnesses; // updated once per maintenance interval // n.b. witness scheduling is done by witness_schedule object flat_set witness_accounts; // updated once per maintenance interval - - chain_id_type chain_id; }; /** @@ -124,5 +122,4 @@ FC_REFLECT_DERIVED( graphene::chain::global_property_object, (graphene::db::obje (next_available_vote_id) (active_committee_members) (active_witnesses) - (chain_id) )