Fix geth blocktest command

pull/1236/head
Taylor Gerring 10 years ago
parent 6931267324
commit 8507c867b9
  1. 1
      cmd/geth/blocktestcmd.go
  2. 4
      tests/block_test_util.go

@ -86,6 +86,7 @@ func runBlockTest(ctx *cli.Context) {
} }
func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, error) { func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, error) {
// TODO remove in favor of logic contained in tests package
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx)
cfg.NewDB = func(path string) (common.Database, error) { return ethdb.NewMemDatabase() } cfg.NewDB = func(path string) (common.Database, error) { return ethdb.NewMemDatabase() }
cfg.MaxPeers = 0 // disable network cfg.MaxPeers = 0 // disable network

@ -85,7 +85,7 @@ type btTransaction struct {
} }
func RunBlockTest(filepath string) error { func RunBlockTest(filepath string) error {
bt, err := loadBlockTests(filepath) bt, err := LoadBlockTests(filepath)
if err != nil { if err != nil {
return err return err
} }
@ -449,7 +449,7 @@ func mustConvertUint(in string, base int) uint64 {
return out return out
} }
func loadBlockTests(file string) (map[string]*BlockTest, error) { func LoadBlockTests(file string) (map[string]*BlockTest, error) {
bt := make(map[string]*btJSON) bt := make(map[string]*btJSON)
if err := readTestFile(file, &bt); err != nil { if err := readTestFile(file, &bt); err != nil {
return nil, err return nil, err

Loading…
Cancel
Save