From 84d11c19fd246e245906ca7e498a67f6e0c55e1e Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 15 Jun 2016 01:53:04 +0200
Subject: [PATCH] eth: remove dapp database remains

---
 core/types.go     |  1 -
 eth/backend.go    | 28 ++++++----------------------
 ethdb/database.go |  2 --
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/core/types.go b/core/types.go
index 20f33a153..e656bf853 100644
--- a/core/types.go
+++ b/core/types.go
@@ -73,6 +73,5 @@ type Backend interface {
 	BlockChain() *BlockChain
 	TxPool() *TxPool
 	ChainDb() ethdb.Database
-	DappDb() ethdb.Database
 	EventMux() *event.TypeMux
 }
diff --git a/eth/backend.go b/eth/backend.go
index 9b1ca306a..22388ddb5 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -115,7 +115,6 @@ type Ethereum struct {
 	protocolManager *ProtocolManager
 	// DB interfaces
 	chainDb ethdb.Database // Block chain database
-	dappDb  ethdb.Database // Dapp database
 
 	eventMux       *event.TypeMux
 	pow            *ethash.Ethash
@@ -142,7 +141,7 @@ type Ethereum struct {
 // New creates a new Ethereum object (including the
 // initialisation of the common Ethereum object)
 func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
-	chainDb, dappDb, err := CreateDBs(ctx, config)
+	chainDb, err := createDB(ctx, config)
 	if err != nil {
 		return nil, err
 	}
@@ -157,7 +156,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 
 	eth := &Ethereum{
 		chainDb:        chainDb,
-		dappDb:         dappDb,
 		eventMux:       ctx.EventMux,
 		accountManager: ctx.AccountManager,
 		pow:            pow,
@@ -243,25 +241,13 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 	return eth, nil
 }
 
-// CreateDBs creates the chain and dapp databases for an Ethereum service
-func CreateDBs(ctx *node.ServiceContext, config *Config) (chainDb, dappDb ethdb.Database, err error) {
-	// Open the chain database and perform any upgrades needed
-	chainDb, err = ctx.OpenDatabase("chaindata", config.DatabaseCache, config.DatabaseHandles)
-	if err != nil {
-		return nil, nil, err
-	}
-	if db, ok := chainDb.(*ethdb.LDBDatabase); ok {
+// createDB creates the chain database.
+func createDB(ctx *node.ServiceContext, config *Config) (ethdb.Database, error) {
+	db, err := ctx.OpenDatabase("chaindata", config.DatabaseCache, config.DatabaseHandles)
+	if db, ok := db.(*ethdb.LDBDatabase); ok {
 		db.Meter("eth/db/chaindata/")
 	}
-
-	dappDb, err = ctx.OpenDatabase("dapp", config.DatabaseCache, config.DatabaseHandles)
-	if err != nil {
-		return nil, nil, err
-	}
-	if db, ok := dappDb.(*ethdb.LDBDatabase); ok {
-		db.Meter("eth/db/dapp/")
-	}
-	return
+	return db, err
 }
 
 // SetupGenesisBlock initializes the genesis block for an Ethereum service
@@ -389,7 +375,6 @@ func (s *Ethereum) TxPool() *core.TxPool               { return s.txPool }
 func (s *Ethereum) EventMux() *event.TypeMux           { return s.eventMux }
 func (s *Ethereum) Pow() *ethash.Ethash                { return s.pow }
 func (s *Ethereum) ChainDb() ethdb.Database            { return s.chainDb }
-func (s *Ethereum) DappDb() ethdb.Database             { return s.dappDb }
 func (s *Ethereum) IsListening() bool                  { return true } // Always listening
 func (s *Ethereum) EthVersion() int                    { return int(s.protocolManager.SubProtocols[0].Version) }
 func (s *Ethereum) NetVersion() int                    { return s.netVersionId }
@@ -427,7 +412,6 @@ func (s *Ethereum) Stop() error {
 	s.StopAutoDAG()
 
 	s.chainDb.Close()
-	s.dappDb.Close()
 	close(s.shutdownChan)
 
 	return nil
diff --git a/ethdb/database.go b/ethdb/database.go
index 29da4a197..f93731cfe 100644
--- a/ethdb/database.go
+++ b/ethdb/database.go
@@ -39,14 +39,12 @@ var OpenFileLimit = 64
 // cacheRatio specifies how the total allotted cache is distributed between the
 // various system databases.
 var cacheRatio = map[string]float64{
-	"dapp":      0.0,
 	"chaindata": 1.0,
 }
 
 // handleRatio specifies how the total allotted file descriptors is distributed
 // between the various system databases.
 var handleRatio = map[string]float64{
-	"dapp":      0.0,
 	"chaindata": 1.0,
 }