From 80985f97da8174576ee227909035a364af2fd6c9 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 10 Mar 2015 02:35:46 +0100
Subject: cmd/evm, core, ethdb, state, tests/helper: remove ReadConfig calls

---
 cmd/evm/main.go            | 2 --
 core/chain_manager_test.go | 2 --
 core/helper_test.go        | 2 --
 ethdb/database_test.go     | 2 --
 state/state_test.go        | 1 -
 tests/helper/init.go       | 3 ---
 6 files changed, 12 deletions(-)

diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index d6a93460e..960558bb4 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -59,8 +59,6 @@ func main() {
 
 	logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(*loglevel)))
 
-	ethutil.ReadConfig("/tmp/evmtest", "/tmp/evm", "")
-
 	db, _ := ethdb.NewMemDatabase()
 	statedb := state.New(nil, db)
 	sender := statedb.NewStateObject([]byte("sender"))
diff --git a/core/chain_manager_test.go b/core/chain_manager_test.go
index e78c2e980..91822f9e2 100644
--- a/core/chain_manager_test.go
+++ b/core/chain_manager_test.go
@@ -12,14 +12,12 @@ import (
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/rlp"
 )
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
-	ethutil.ReadConfig("/tmp/ethtest", "/tmp/ethtest", "ETH")
 }
 
 // Test fork of length N starting from block i
diff --git a/core/helper_test.go b/core/helper_test.go
index 473576e3f..36d9e70a8 100644
--- a/core/helper_test.go
+++ b/core/helper_test.go
@@ -62,8 +62,6 @@ func (tm *TestManager) Db() ethutil.Database {
 }
 
 func NewTestManager() *TestManager {
-	ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "ETH")
-
 	db, err := ethdb.NewMemDatabase()
 	if err != nil {
 		fmt.Println("Could not create mem-db, failing")
diff --git a/ethdb/database_test.go b/ethdb/database_test.go
index 2cbaf58e0..7de30fd81 100644
--- a/ethdb/database_test.go
+++ b/ethdb/database_test.go
@@ -7,8 +7,6 @@ import (
 )
 
 func TestCompression(t *testing.T) {
-	ethutil.ReadConfig("", "/tmp", "")
-
 	db, err := NewLDBDatabase("testdb")
 	if err != nil {
 		t.Fatal(err)
diff --git a/state/state_test.go b/state/state_test.go
index 6b6d52881..07e35f7e2 100644
--- a/state/state_test.go
+++ b/state/state_test.go
@@ -57,7 +57,6 @@ func (s *StateSuite) TestDump(c *checker.C) {
 }
 
 func (s *StateSuite) SetUpTest(c *checker.C) {
-	ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
 	db, _ := ethdb.NewMemDatabase()
 	s.state = New(nil, db)
 }
diff --git a/tests/helper/init.go b/tests/helper/init.go
index df98b9e42..e0892d8f6 100644
--- a/tests/helper/init.go
+++ b/tests/helper/init.go
@@ -4,7 +4,6 @@ import (
 	"log"
 	"os"
 
-	"github.com/ethereum/go-ethereum/ethutil"
 	logpkg "github.com/ethereum/go-ethereum/logger"
 )
 
@@ -14,6 +13,4 @@ var Log = logpkg.NewLogger("TEST")
 func init() {
 	Logger = logpkg.NewStdLogSystem(os.Stdout, log.LstdFlags, logpkg.InfoLevel)
 	logpkg.AddLogSystem(Logger)
-
-	ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
 }
-- 
cgit