cmd/evm, core, ethdb, state, tests/helper: remove ReadConfig calls

pull/447/head
Felix Lange 10 years ago
parent e6118f2d79
commit 80985f97da
  1. 2
      cmd/evm/main.go
  2. 2
      core/chain_manager_test.go
  3. 2
      core/helper_test.go
  4. 2
      ethdb/database_test.go
  5. 1
      state/state_test.go
  6. 3
      tests/helper/init.go

@ -59,8 +59,6 @@ func main() {
logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(*loglevel))) logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(*loglevel)))
ethutil.ReadConfig("/tmp/evmtest", "/tmp/evm", "")
db, _ := ethdb.NewMemDatabase() db, _ := ethdb.NewMemDatabase()
statedb := state.New(nil, db) statedb := state.New(nil, db)
sender := statedb.NewStateObject([]byte("sender")) sender := statedb.NewStateObject([]byte("sender"))

@ -12,14 +12,12 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
) )
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())
ethutil.ReadConfig("/tmp/ethtest", "/tmp/ethtest", "ETH")
} }
// Test fork of length N starting from block i // Test fork of length N starting from block i

@ -62,8 +62,6 @@ func (tm *TestManager) Db() ethutil.Database {
} }
func NewTestManager() *TestManager { func NewTestManager() *TestManager {
ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "ETH")
db, err := ethdb.NewMemDatabase() db, err := ethdb.NewMemDatabase()
if err != nil { if err != nil {
fmt.Println("Could not create mem-db, failing") fmt.Println("Could not create mem-db, failing")

@ -7,8 +7,6 @@ import (
) )
func TestCompression(t *testing.T) { func TestCompression(t *testing.T) {
ethutil.ReadConfig("", "/tmp", "")
db, err := NewLDBDatabase("testdb") db, err := NewLDBDatabase("testdb")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

@ -57,7 +57,6 @@ func (s *StateSuite) TestDump(c *checker.C) {
} }
func (s *StateSuite) SetUpTest(c *checker.C) { func (s *StateSuite) SetUpTest(c *checker.C) {
ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
db, _ := ethdb.NewMemDatabase() db, _ := ethdb.NewMemDatabase()
s.state = New(nil, db) s.state = New(nil, db)
} }

@ -4,7 +4,6 @@ import (
"log" "log"
"os" "os"
"github.com/ethereum/go-ethereum/ethutil"
logpkg "github.com/ethereum/go-ethereum/logger" logpkg "github.com/ethereum/go-ethereum/logger"
) )
@ -14,6 +13,4 @@ var Log = logpkg.NewLogger("TEST")
func init() { func init() {
Logger = logpkg.NewStdLogSystem(os.Stdout, log.LstdFlags, logpkg.InfoLevel) Logger = logpkg.NewStdLogSystem(os.Stdout, log.LstdFlags, logpkg.InfoLevel)
logpkg.AddLogSystem(Logger) logpkg.AddLogSystem(Logger)
ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
} }

Loading…
Cancel
Save