From 6690da485f07fdf264106a50ed505247de0e6cff Mon Sep 17 00:00:00 2001 From: Tsvetomir Dimitrov Date: Tue, 15 Dec 2020 22:05:55 +0200 Subject: [PATCH] Fixup for aea24f9 (#1094) Remove header dependency to kv_types.hpp --- storage/CMakeLists.txt | 1 - storage/include/s3/metrics.hpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index 5f3242c8af..84d7d498a1 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -10,7 +10,6 @@ find_library(LIBS3 s3) target_compile_definitions(concordbft_storage PUBLIC USE_S3_OBJECT_STORE=1) target_sources(concordbft_storage PRIVATE src/s3/client.cpp) target_link_libraries(concordbft_storage PRIVATE ${LIBS3}) -target_include_directories(concordbft_storage PRIVATE ${CMAKE_SOURCE_DIR}/kvbc/include/) endif(USE_S3_OBJECT_STORE) if (BUILD_ROCKSDB_STORAGE) diff --git a/storage/include/s3/metrics.hpp b/storage/include/s3/metrics.hpp index 13c3d43f66..8e1749e57d 100644 --- a/storage/include/s3/metrics.hpp +++ b/storage/include/s3/metrics.hpp @@ -2,7 +2,6 @@ #include "Metrics.hpp" #include "sliver.hpp" -#include "kv_types.hpp" #include "Logger.hpp" namespace concord::storage::s3 { @@ -56,7 +55,7 @@ class Metrics { last_saved_block_id_.Get().Set(lastSavedBlockVal); } - kvbc::BlockId getLastSavedBlockId() { return last_saved_block_id_.Get().Get(); } + uint64_t getLastSavedBlockId() { return last_saved_block_id_.Get().Get(); } concordMetrics::Component metrics_component;