Commit 8507c867 authored by Taylor Gerring's avatar Taylor Gerring

Fix geth blocktest command

parent 69312673
...@@ -86,6 +86,7 @@ func runBlockTest(ctx *cli.Context) { ...@@ -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 { ...@@ -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 { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment