logger, pow/dagger, pow/ezp: delete dead code

cmd/geth/main.go

@@ -168,7 +168,6 @@ func init() {
 	}
 
 	app.After = func(ctx *cli.Context) error {
-		logger.Flush()
 		debug.Exit()
 		console.Stdin.Close() // Resets terminal mode.
 		return nil

cmd/utils/cmd.go

@@ -67,7 +67,6 @@ func Fatalf(format string, args ...interface{}) {
 		}
 	}
 	fmt.Fprintf(w, "Fatal: "+format+"\n", args...)
-	logger.Flush()
 	os.Exit(1)
 }
 

core/block_validator_test.go

@@ -27,7 +27,6 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/pow/ezp"
 )
 
 func testChainConfig() *params.ChainConfig {
@@ -48,20 +47,19 @@ func proc() (Validator, *BlockChain) {
 }
 
 func TestNumber(t *testing.T) {
-	pow := ezp.New()
 	_, chain := proc()
 
 	statedb, _ := state.New(chain.Genesis().Root(), chain.chainDb)
 	cfg := testChainConfig()
 	header := makeHeader(cfg, chain.Genesis(), statedb)
 	header.Number = big.NewInt(3)
-	err := ValidateHeader(cfg, pow, header, chain.Genesis().Header(), false, false)
+	err := ValidateHeader(cfg, FakePow{}, header, chain.Genesis().Header(), false, false)
 	if err != BlockNumberErr {
 		t.Errorf("expected block number error, got %q", err)
 	}
 
 	header = makeHeader(cfg, chain.Genesis(), statedb)
-	err = ValidateHeader(cfg, pow, header, chain.Genesis().Header(), false, false)
+	err = ValidateHeader(cfg, FakePow{}, header, chain.Genesis().Header(), false, false)
 	if err == BlockNumberErr {
 		t.Errorf("didn't expect block number error")
 	}

core/blockchain.go

@@ -46,9 +46,6 @@ import (
 )
 
 var (
-	chainlogger = logger.NewLogger("CHAIN")
-	jsonlogger  = logger.NewJsonLogger()
-
 	blockInsertTimer = metrics.NewTimer("chain/inserts")
 
 	ErrNoGenesis = errors.New("Genesis not found in chain")

errs/errors.go

@@ -19,7 +19,6 @@ package errs
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
 )
 
@@ -32,15 +31,10 @@ Fields:
 
  Package:
   name of the package/component
-
- Level:
-  a function mapping error code to logger.LogLevel (severity)
-  if not given, errors default to logger.InfoLevel
 */
 type Errors struct {
 	Errors  map[int]string
 	Package string
-	Level   func(code int) logger.LogLevel
 }
 
 /*
@@ -58,7 +52,6 @@ type Error struct {
 	Code    int
 	Name    string
 	Package string
-	level   logger.LogLevel
 	message string
 	format  string
 	params  []interface{}
@@ -69,15 +62,10 @@ func (self *Errors) New(code int, format string, params ...interface{}) *Error {
 	if !ok {
 		panic("invalid error code")
 	}
-	level := logger.InfoLevel
-	if self.Level != nil {
-		level = self.Level(code)
-	}
 	return &Error{
 		Code:    code,
 		Name:    name,
 		Package: self.Package,
-		level:   level,
 		format:  format,
 		params:  params,
 	}
@@ -98,13 +86,3 @@ func (self Error) Log(v glog.Verbose) {
 		v.Infoln(self)
 	}
 }
-
-/*
-err.Fatal() is true if err's severity level is 0 or 1 (logger.ErrorLevel or logger.Silence)
-*/
-func (self *Error) Fatal() (fatal bool) {
-	if self.level < logger.WarnLevel {
-		fatal = true
-	}
-	return
-}

errs/errors_test.go

@@ -19,8 +19,6 @@ package errs
 import (
 	"fmt"
 	"testing"
-
-	"github.com/ethereum/go-ethereum/logger"
 )
 
 func testErrors() *Errors {
@@ -30,14 +28,6 @@ func testErrors() *Errors {
 			0: "zero",
 			1: "one",
 		},
-		Level: func(i int) (l logger.LogLevel) {
-			if i == 0 {
-				l = logger.ErrorLevel
-			} else {
-				l = logger.WarnLevel
-			}
-			return
-		},
 	}
 }
 
@@ -49,14 +39,3 @@ func TestErrorMessage(t *testing.T) {
 		t.Errorf("error message incorrect. expected %v, got %v", exp, message)
 	}
 }
-
-func TestErrorSeverity(t *testing.T) {
-	err0 := testErrors().New(0, "zero detail")
-	if !err0.Fatal() {
-		t.Errorf("error should be fatal")
-	}
-	err1 := testErrors().New(1, "one detail")
-	if err1.Fatal() {
-		t.Errorf("error should not be fatal")
-	}
-}