From 8aa048661fb4770b170f76f944e1cab27aecd611 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 15 Jul 2015 17:06:45 -0400 Subject: [PATCH] Remove unused undo_block and undo_transaction skip flags --- libraries/chain/db_management.cpp | 2 -- .../chain/include/graphene/chain/database.hpp | 18 ++++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 3dab21c3..6a9a81fa 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -53,8 +53,6 @@ void database::reindex(fc::path data_dir, const genesis_state_type& initial_allo { apply_block(*_block_id_to_block.fetch_by_number(i), skip_witness_signature | skip_transaction_signatures | - skip_undo_block | - skip_undo_transaction | skip_transaction_dupe_check | skip_tapos_check | skip_authority_check); diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 034aece9..f89346a4 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -82,16 +82,14 @@ namespace graphene { namespace chain { skip_nothing = 0, skip_witness_signature = 1 << 0, ///< used while reindexing skip_transaction_signatures = 1 << 1, ///< used by non-witness nodes - skip_undo_block = 1 << 2, ///< used while reindexing - skip_undo_transaction = 1 << 3, ///< used while applying block - skip_transaction_dupe_check = 1 << 4, ///< used while reindexing - skip_fork_db = 1 << 5, ///< used while reindexing - skip_block_size_check = 1 << 6, ///< used when applying locally generated transactions - skip_tapos_check = 1 << 7, ///< used while reindexing -- note this skips expiration check as well - skip_authority_check = 1 << 8, ///< used while reindexing -- disables any checking of authority on transactions - skip_merkle_check = 1 << 9, ///< used while reindexing - skip_assert_evaluation = 1 << 10, ///< used while reindexing - skip_undo_history_check = 1 << 11 ///< used while reindexing + skip_transaction_dupe_check = 1 << 2, ///< used while reindexing + skip_fork_db = 1 << 3, ///< used while reindexing + skip_block_size_check = 1 << 4, ///< used when applying locally generated transactions + skip_tapos_check = 1 << 5, ///< used while reindexing -- note this skips expiration check as well + skip_authority_check = 1 << 6, ///< used while reindexing -- disables any checking of authority on transactions + skip_merkle_check = 1 << 7, ///< used while reindexing + skip_assert_evaluation = 1 << 8, ///< used while reindexing + skip_undo_history_check = 1 << 9 ///< used while reindexing }; /**