aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei-Ning Huang <w@cobinhood.com>2018-10-15 12:16:18 +0800
committerWei-Ning Huang <w@byzantine-lab.io>2019-06-12 17:23:39 +0800
commit2e1556d551420e5f52d6e4e157b46963277eaccd (patch)
tree03875aaa88fb06ac64738c0c4d38b9a703a0ca90
parent09496d7fa81e7ab90131a648da0a870b7e0ac7bf (diff)
downloadgo-tangerine-2e1556d551420e5f52d6e4e157b46963277eaccd.tar
go-tangerine-2e1556d551420e5f52d6e4e157b46963277eaccd.tar.gz
go-tangerine-2e1556d551420e5f52d6e4e157b46963277eaccd.tar.bz2
go-tangerine-2e1556d551420e5f52d6e4e157b46963277eaccd.tar.lz
go-tangerine-2e1556d551420e5f52d6e4e157b46963277eaccd.tar.xz
go-tangerine-2e1556d551420e5f52d6e4e157b46963277eaccd.tar.zst
go-tangerine-2e1556d551420e5f52d6e4e157b46963277eaccd.zip
dex: move dexcon blockdb into datadir
-rw-r--r--dex/backend.go4
-rw-r--r--node/node.go2
-rw-r--r--node/service.go8
3 files changed, 8 insertions, 6 deletions
diff --git a/dex/backend.go b/dex/backend.go
index 3d59d9f2c..0e475dec0 100644
--- a/dex/backend.go
+++ b/dex/backend.go
@@ -19,6 +19,7 @@ package dex
import (
"fmt"
+ "path/filepath"
"time"
dexCore "github.com/dexon-foundation/dexon-consensus-core/core"
@@ -82,7 +83,8 @@ type Dexon struct {
func New(ctx *node.ServiceContext, config *Config) (*Dexon, error) {
// Consensus.
- db, err := blockdb.NewLevelDBBackedBlockDB("main.blockdb")
+ blockDBPath := filepath.Join(ctx.Config.DataDir, "dexcon", "blockdb")
+ db, err := blockdb.NewLevelDBBackedBlockDB(blockDBPath)
if err != nil {
panic(err)
}
diff --git a/node/node.go b/node/node.go
index ffa9fa1b0..5f2c30e9b 100644
--- a/node/node.go
+++ b/node/node.go
@@ -170,8 +170,8 @@ func (n *Node) Start() error {
for _, constructor := range n.serviceFuncs {
// Create a new context for the particular service
ctx := &ServiceContext{
- config: n.config,
services: make(map[reflect.Type]Service),
+ Config: n.config,
ServerConfig: &n.serverConfig,
EventMux: n.eventmux,
AccountManager: n.accman,
diff --git a/node/service.go b/node/service.go
index 7f9683362..380f01c0f 100644
--- a/node/service.go
+++ b/node/service.go
@@ -30,8 +30,8 @@ import (
// the protocol stack, that is passed to all constructors to be optionally used;
// as well as utility methods to operate on the service environment.
type ServiceContext struct {
- config *Config
services map[reflect.Type]Service // Index of the already constructed services
+ Config *Config
ServerConfig *p2p.Config
EventMux *event.TypeMux // Event multiplexer used for decoupled notifications
AccountManager *accounts.Manager // Account manager created by the node.
@@ -41,10 +41,10 @@ type ServiceContext struct {
// if no previous can be found) from within the node's data directory. If the
// node is an ephemeral one, a memory database is returned.
func (ctx *ServiceContext) OpenDatabase(name string, cache int, handles int) (ethdb.Database, error) {
- if ctx.config.DataDir == "" {
+ if ctx.Config.DataDir == "" {
return ethdb.NewMemDatabase(), nil
}
- db, err := ethdb.NewLDBDatabase(ctx.config.ResolvePath(name), cache, handles)
+ db, err := ethdb.NewLDBDatabase(ctx.Config.ResolvePath(name), cache, handles)
if err != nil {
return nil, err
}
@@ -55,7 +55,7 @@ func (ctx *ServiceContext) OpenDatabase(name string, cache int, handles int) (et
// and if the user actually uses persistent storage. It will return an empty string
// for emphemeral storage and the user's own input for absolute paths.
func (ctx *ServiceContext) ResolvePath(path string) string {
- return ctx.config.ResolvePath(path)
+ return ctx.Config.ResolvePath(path)
}
// Service retrieves a currently running service registered of a specific type.