From e29396b6915a27d3e44be45fe9e540c6ef39f1dd Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Fri, 27 Mar 2015 09:36:18 +0100
Subject: Use ExtraDB for storage. Fixes #577

---
 rpc/api.go | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'rpc/api.go')

diff --git a/rpc/api.go b/rpc/api.go
index aa5b54199..f2915f658 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -3,13 +3,11 @@ package rpc
 import (
 	"encoding/json"
 	"math/big"
-	"path"
 	"sync"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/xeth"
 )
 
@@ -19,15 +17,9 @@ type EthereumApi struct {
 	db     common.Database
 }
 
-func NewEthereumApi(xeth *xeth.XEth, dataDir string) *EthereumApi {
-	// What about when dataDir is empty?
-	db, err := ethdb.NewLDBDatabase(path.Join(dataDir, "dapps"))
-	if err != nil {
-		panic(err)
-	}
+func NewEthereumApi(xeth *xeth.XEth) *EthereumApi {
 	api := &EthereumApi{
 		eth: xeth,
-		db:  db,
 	}
 
 	return api
@@ -44,10 +36,6 @@ func (api *EthereumApi) xethAtStateNum(num int64) *xeth.XEth {
 	return api.xeth().AtStateNum(num)
 }
 
-func (api *EthereumApi) Close() {
-	api.db.Close()
-}
-
 func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error {
 	// Spec at https://github.com/ethereum/wiki/wiki/JSON-RPC
 	rpclogger.Debugf("%s %s", req.Method, req.Params)
@@ -370,7 +358,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 			return err
 		}
 
-		api.db.Put([]byte(args.Database+args.Key), args.Value)
+		api.xeth().DbPut([]byte(args.Database+args.Key), args.Value)
+
 		*reply = true
 	case "db_getString":
 		args := new(DbArgs)
@@ -382,7 +371,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 			return err
 		}
 
-		res, _ := api.db.Get([]byte(args.Database + args.Key))
+		res, _ := api.xeth().DbGet([]byte(args.Database + args.Key))
 		*reply = string(res)
 	case "db_putHex":
 		args := new(DbHexArgs)
@@ -394,7 +383,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 			return err
 		}
 
-		api.db.Put([]byte(args.Database+args.Key), args.Value)
+		api.xeth().DbPut([]byte(args.Database+args.Key), args.Value)
 		*reply = true
 	case "db_getHex":
 		args := new(DbHexArgs)
@@ -406,7 +395,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 			return err
 		}
 
-		res, _ := api.db.Get([]byte(args.Database + args.Key))
+		res, _ := api.xeth().DbGet([]byte(args.Database + args.Key))
 		*reply = common.ToHex(res)
 	case "shh_version":
 		*reply = api.xeth().WhisperVersion()
-- 
cgit v1.2.3