rpc: Drop db module

ShifaSZ · Sep 27, 2017 · 105d1ff · 105d1ff
1 parent e5cf591
commit 105d1ff
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 251 deletions.
diff --git a/eth/main.cpp b/eth/main.cpp
@@ -50,7 +50,6 @@
 #include <libweb3jsonrpc/SafeHttpServer.h>
 #include <libweb3jsonrpc/ModularServer.h>
 #include <libweb3jsonrpc/IpcServer.h>
-#include <libweb3jsonrpc/LevelDB.h>
 #include <libweb3jsonrpc/Whisper.h>
 #include <libweb3jsonrpc/Net.h>
 #include <libweb3jsonrpc/Web3.h>
@@ -1157,7 +1156,7 @@ int main(int argc, char** argv)
 	if (jsonRPCURL > -1 || ipc)
 	{
 		using FullServer = ModularServer<
-			rpc::EthFace, rpc::DBFace, rpc::WhisperFace,
+			rpc::EthFace, rpc::WhisperFace,
 			rpc::NetFace, rpc::Web3Face, rpc::PersonalFace,
 			rpc::AdminEthFace, rpc::AdminNetFace, rpc::AdminUtilsFace,
 			rpc::DebugFace, rpc::TestFace
@@ -1185,7 +1184,7 @@ int main(int argc, char** argv)
 			}
 
 			jsonrpcHttpServer.reset(new FullServer(
-				ethFace, new rpc::LevelDB(), new rpc::Whisper(web3, {}),
+				ethFace, new rpc::Whisper(web3, {}),
 				new rpc::Net(web3), new rpc::Web3(web3.clientVersion()), personal,
 				adminEth, adminNet, adminUtils,
 				new rpc::Debug(*web3.ethereum()),
@@ -1199,7 +1198,7 @@ int main(int argc, char** argv)
 		if (ipc)
 		{
 			jsonrpcIpcServer.reset(new FullServer(
-				ethFace, new rpc::LevelDB(), new rpc::Whisper(web3, {}), new rpc::Net(web3),
+				ethFace, new rpc::Whisper(web3, {}), new rpc::Net(web3),
 				new rpc::Web3(web3.clientVersion()), new rpc::Personal(keyManager, *accountHolder, *web3.ethereum()),
 				new rpc::AdminEth(*web3.ethereum(), *gasPricer.get(), keyManager, *sessionManager.get()),
 				new rpc::AdminNet(web3, *sessionManager.get()),

diff --git a/libweb3jsonrpc/CMakeLists.txt b/libweb3jsonrpc/CMakeLists.txt
@@ -7,11 +7,6 @@ jsonrpcstub_create(web3jsonrpc eth.json
 	EthClient ${CMAKE_CURRENT_BINARY_DIR} EthClient
 )
 
-jsonrpcstub_create(web3jsonrpc db.json
-	dev::rpc::DBFace ${CMAKE_CURRENT_SOURCE_DIR} DBFace
-	DBClient ${CMAKE_CURRENT_BINARY_DIR} DBClient
-)
-
 jsonrpcstub_create(web3jsonrpc debug.json
 	dev::rpc::DebugFace ${CMAKE_CURRENT_SOURCE_DIR} DebugFace
 	DebugClient ${CMAKE_CURRENT_BINARY_DIR} DebugClient

diff --git a/libweb3jsonrpc/DBFace.h b/libweb3jsonrpc/DBFace.h
diff --git a/libweb3jsonrpc/LevelDB.cpp b/libweb3jsonrpc/LevelDB.cpp
diff --git a/libweb3jsonrpc/LevelDB.h b/libweb3jsonrpc/LevelDB.h
diff --git a/libweb3jsonrpc/MemoryDB.cpp b/libweb3jsonrpc/MemoryDB.cpp
diff --git a/libweb3jsonrpc/MemoryDB.h b/libweb3jsonrpc/MemoryDB.h
diff --git a/libweb3jsonrpc/db.json b/libweb3jsonrpc/db.json