From 8507c867b9cca2b1d59182baea90ab2844d494a0 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Thu, 11 Jun 2015 12:20:30 -0400
Subject: [PATCH] Fix geth blocktest command
---
cmd/geth/blocktestcmd.go | 1 +
tests/block_test_util.go | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmd/geth/blocktestcmd.go b/cmd/geth/blocktestcmd.go
index ffea4400e..116eec2b3 100644
--- a/cmd/geth/blocktestcmd.go
+++ b/cmd/geth/blocktestcmd.go
@@ -86,6 +86,7 @@ func runBlockTest(ctx *cli.Context) {
}
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.NewDB = func(path string) (common.Database, error) { return ethdb.NewMemDatabase() }
cfg.MaxPeers = 0 // disable network
diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index 7db47566b..787056b89 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -85,7 +85,7 @@ type btTransaction struct {
}
func RunBlockTest(filepath string) error {
- bt, err := loadBlockTests(filepath)
+ bt, err := LoadBlockTests(filepath)
if err != nil {
return err
}
@@ -449,7 +449,7 @@ func mustConvertUint(in string, base int) uint64 {
return out
}
-func loadBlockTests(file string) (map[string]*BlockTest, error) {
+func LoadBlockTests(file string) (map[string]*BlockTest, error) {
bt := make(map[string]*btJSON)
if err := readTestFile(file, &bt); err != nil {
return nil, err
--
GitLab