From 7b40e22279b73e4824e1d04ba6a88a80f6e34cd6 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <mail@smessmer.de>
Date: Thu, 16 Apr 2015 14:11:07 +0200
Subject: [PATCH] Adapt to new blockstore

---
 src/CryDevice.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CryDevice.cpp b/src/CryDevice.cpp
index 383cfafa..67253766 100644
--- a/src/CryDevice.cpp
+++ b/src/CryDevice.cpp
@@ -1,3 +1,4 @@
+#include <messmer/blockstore/implementations/caching/CachingBlockStore.h>
 #include "impl/DirBlob.h"
 #include "CryDevice.h"
 
@@ -8,7 +9,6 @@
 #include "messmer/blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
 #include "messmer/blobstore/implementations/onblocks/BlobOnBlocks.h"
 #include "messmer/blockstore/implementations/encrypted/EncryptedBlockStore.h"
-#include "messmer/blockstore/implementations/caching2/Caching2BlockStore.h"
 
 using std::unique_ptr;
 using std::make_unique;
@@ -23,14 +23,14 @@ using blockstore::Key;
 using blockstore::encrypted::EncryptedBlockStore;
 using blobstore::onblocks::BlobStoreOnBlocks;
 using blobstore::onblocks::BlobOnBlocks;
-using blockstore::caching2::Caching2BlockStore;
+using blockstore::caching::CachingBlockStore;
 
 namespace cryfs {
 
 constexpr uint32_t CryDevice::BLOCKSIZE_BYTES;
 
 CryDevice::CryDevice(unique_ptr<CryConfig> config, unique_ptr<BlockStore> blockStore)
-: _blobStore(make_unique<BlobStoreOnBlocks>(make_unique<Caching2BlockStore>(make_unique<EncryptedBlockStore>(std::move(blockStore), config->EncryptionKey())), BLOCKSIZE_BYTES)), _rootKey(GetOrCreateRootKey(config.get())) {
+: _blobStore(make_unique<BlobStoreOnBlocks>(make_unique<CachingBlockStore>(make_unique<EncryptedBlockStore>(std::move(blockStore), config->EncryptionKey())), BLOCKSIZE_BYTES)), _rootKey(GetOrCreateRootKey(config.get())) {
 }
 
 Key CryDevice::GetOrCreateRootKey(CryConfig *config) {