From 02acef23d595dc2bc95295bab63658addf664aaf Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 11 Feb 2014 18:46:28 +0100
Subject: Interop!

---
 ethereum.go | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'ethereum.go')

diff --git a/ethereum.go b/ethereum.go
index cac442dfc..6ace58308 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -60,8 +60,8 @@ type Ethereum struct {
 }
 
 func New(caps Caps, usePnp bool) (*Ethereum, error) {
-	db, err := ethdb.NewLDBDatabase()
-	//db, err := ethdb.NewMemDatabase()
+	//db, err := ethdb.NewLDBDatabase()
+	db, err := ethdb.NewMemDatabase()
 	if err != nil {
 		return nil, err
 	}
@@ -246,19 +246,22 @@ func (s *Ethereum) Start() {
 	// Start the tx pool
 	s.TxPool.Start()
 
-	resp, err := http.Get("http://www.ethereum.org/servers.poc2.txt")
-	if err != nil {
-		log.Println("Fetching seed failed:", err)
-		return
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		log.Println("Reading seed failed:", err)
-		return
-	}
+	if ethutil.Config.Seed {
+		// Testnet seed bootstrapping
+		resp, err := http.Get("http://www.ethereum.org/servers.poc2.txt")
+		if err != nil {
+			log.Println("Fetching seed failed:", err)
+			return
+		}
+		defer resp.Body.Close()
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			log.Println("Reading seed failed:", err)
+			return
+		}
 
-	s.ConnectToPeer(string(body))
+		s.ConnectToPeer(string(body))
+	}
 }
 
 func (s *Ethereum) peerHandler(listener net.Listener) {
-- 
cgit