Remove FatDB support.

CMakeLists.txt

@@ -37,7 +37,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 #defaults:
 set(D_CMAKE_BUILD_TYPE "Release")
 set(D_GUI ON)
-set(D_FATDB ON)
 set(D_ETHASHCL ON)
 set(D_ETHASHCUDA OFF)
 set(D_JSONRPC ON)
@@ -52,26 +51,21 @@ if (BUNDLE STREQUAL "minimal")
 	set(D_GUI OFF)
 elseif (BUNDLE STREQUAL "full")
 	set(D_GUI ON)
-	set(D_FATDB ON)
 elseif (BUNDLE STREQUAL "cli")
 	set(D_GUI OFF)
-	set(D_FATDB ON)
 elseif (BUNDLE STREQUAL "core")
 	set(D_GUI ON)
-	set(D_FATDB ON)
 elseif (BUNDLE STREQUAL "user")
 	set(D_GUI ON)
 elseif (BUNDLE STREQUAL "wallet")
 	set(D_GUI OFF)
 	set(D_MINER OFF)
 	set(D_ETHASHCL OFF)
-	set(D_FATDB OFF)
 	set(D_JSONRPC OFF)
 elseif (BUNDLE STREQUAL "miner")
 	set(D_GUI OFF)
 	set(D_MINER ON)
 	set(D_ETHASHCL ON)
-	set(D_FATDB OFF)
 	set(D_JSONRPC ON)
 	set(D_ETHSTRATUM ON)
 elseif (BUNDLE STREQUAL "cudaminer")
@@ -79,12 +73,10 @@ elseif (BUNDLE STREQUAL "cudaminer")
 	set(D_MINER ON)
 	set(D_ETHASHCL ON)
 	set(D_ETHASHCUDA ON)
-	set(D_FATDB OFF)
 	set(D_JSONRPC ON)
 	set(D_ETHSTRATUM ON)
 elseif (BUNDLE STREQUAL "release")      # release builds
 	set(D_GUI ON)
-	set(D_FATDB OFF)
 	set(D_ETHASHCL ON)
 	set(D_JSONRPC ON)
 	set(D_CMAKE_BUILD_TYPE "Release")
@@ -228,7 +220,6 @@ endmacro()
 # Normalise build options
 eth_format_option(PARANOID)
 eth_format_option(VMTRACE)
-eth_format_option(FATDB)
 eth_format_option(JSONRPC)
 eth_format_option(MINER)
 eth_format_option(PROFILING)

libdevcore/TrieDB.h

@@ -477,12 +477,7 @@ public:
 };
 
 template <class KeyType, class DB> using TrieDB = SpecificTrieDB<GenericTrieDB<DB>, KeyType>;
-
-#if ETH_FATDB
-template <class KeyType, class DB> using SecureTrieDB = SpecificTrieDB<FatGenericTrieDB<DB>, KeyType>;
-#else
 template <class KeyType, class DB> using SecureTrieDB = SpecificTrieDB<HashedGenericTrieDB<DB>, KeyType>;
-#endif
 
 }
 

libethcore/Common.cpp

@@ -41,15 +41,9 @@ namespace eth
 {
 
 const unsigned c_protocolVersion = 61;
-#if ETH_FATDB
-const unsigned c_minorProtocolVersion = 3;
-const unsigned c_databaseBaseVersion = 9;
-const unsigned c_databaseVersionModifier = 1;
-#else
 const unsigned c_minorProtocolVersion = 2;
 const unsigned c_databaseBaseVersion = 9;
 const unsigned c_databaseVersionModifier = 0;
-#endif
 
 const unsigned c_databaseVersion = c_databaseBaseVersion + (c_databaseVersionModifier << 8) + (23 << 9);