From 80223050982dc1e12231af4e91039e9b8aeced42 Mon Sep 17 00:00:00 2001 From: Aleksandr Logunov Date: Mon, 24 Apr 2023 15:21:54 +0400 Subject: [PATCH] fix: remove cfg from undo block tool (#8943) There was a minor conflict while merging #8681 and #8761. Removing cfg(feature) because feature is stabilized now. --- chain/chain/src/store.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/chain/chain/src/store.rs b/chain/chain/src/store.rs index 1a993828d76..dc1d7362205 100644 --- a/chain/chain/src/store.rs +++ b/chain/chain/src/store.rs @@ -2271,11 +2271,9 @@ impl<'a> ChainStoreUpdate<'a> { } // delete flat storage columns: FlatStateChanges and FlatStateDeltaMetadata - if cfg!(feature = "protocol_feature_flat_state") { - let mut store_update = self.store().store_update(); - store_helper::remove_delta(&mut store_update, shard_uid, block_hash); - self.merge(store_update); - } + let mut store_update = self.store().store_update(); + store_helper::remove_delta(&mut store_update, shard_uid, block_hash); + self.merge(store_update); } // 2. Delete block_hash-indexed data