From 8646365b42ddae30e596835b4512792ca11196a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Fri, 24 Apr 2015 18:04:41 +0300
Subject: cmd/bootnode, eth, p2p, p2p/discover: use a fancier db design

---
 eth/backend.go | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'eth')

diff --git a/eth/backend.go b/eth/backend.go
index 039f730f1..28640b63d 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -125,7 +125,6 @@ type Ethereum struct {
 	blockDb common.Database // Block chain database
 	stateDb common.Database // State changes database
 	extraDb common.Database // Extra database (txs, etc)
-	seedDb  *discover.Cache // Peer database seeding the bootstrap
 
 	// Closed when databases are flushed and closed
 	databasesClosed chan bool
@@ -181,10 +180,7 @@ func New(config *Config) (*Ethereum, error) {
 	if err != nil {
 		return nil, err
 	}
-	seedDb, err := discover.NewPersistentCache(path.Join(config.DataDir, "seeds"))
-	if err != nil {
-		return nil, err
-	}
+	nodeDb := path.Join(config.DataDir, "nodes")
 
 	// Perform database sanity checks
 	d, _ := blockDb.Get([]byte("ProtocolVersion"))
@@ -212,7 +208,6 @@ func New(config *Config) (*Ethereum, error) {
 		blockDb:         blockDb,
 		stateDb:         stateDb,
 		extraDb:         extraDb,
-		seedDb:          seedDb,
 		eventMux:        &event.TypeMux{},
 		accountManager:  config.AccountManager,
 		DataDir:         config.DataDir,
@@ -250,7 +245,7 @@ func New(config *Config) (*Ethereum, error) {
 		NAT:            config.NAT,
 		NoDial:         !config.Dial,
 		BootstrapNodes: config.parseBootNodes(),
-		SeedCache:      seedDb,
+		NodeDatabase:   nodeDb,
 	}
 	if len(config.Port) > 0 {
 		eth.net.ListenAddr = ":" + config.Port
@@ -429,7 +424,6 @@ done:
 		}
 	}
 
-	s.seedDb.Close()
 	s.blockDb.Close()
 	s.stateDb.Close()
 	s.extraDb.Close()
-- 
cgit v1.2.3