aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-09-16 22:50:14 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-09-16 22:50:14 +0800
commit985b5f29ed18eac6a36d569edbde6dcfde8d1ab0 (patch)
treea5e098c99993d7abe7e012f147e98a1c68bb046c /cmd/geth
parent1cc2f080417ba77ecb66a058727e00f6644c5e7b (diff)
parentb25258996059439df82687cc653ed14a5a9edce1 (diff)
downloaddexon-985b5f29ed18eac6a36d569edbde6dcfde8d1ab0.tar
dexon-985b5f29ed18eac6a36d569edbde6dcfde8d1ab0.tar.gz
dexon-985b5f29ed18eac6a36d569edbde6dcfde8d1ab0.tar.bz2
dexon-985b5f29ed18eac6a36d569edbde6dcfde8d1ab0.tar.lz
dexon-985b5f29ed18eac6a36d569edbde6dcfde8d1ab0.tar.xz
dexon-985b5f29ed18eac6a36d569edbde6dcfde8d1ab0.tar.zst
dexon-985b5f29ed18eac6a36d569edbde6dcfde8d1ab0.zip
Merge pull request #1801 from fjl/ethdb
all: move common.Database to ethdb and add NewBatch
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/blocktestcmd.go3
-rw-r--r--cmd/geth/chaincmd.go3
-rw-r--r--cmd/geth/js_test.go2
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/geth/blocktestcmd.go b/cmd/geth/blocktestcmd.go
index 4eff82e3d..a667cfd60 100644
--- a/cmd/geth/blocktestcmd.go
+++ b/cmd/geth/blocktestcmd.go
@@ -22,7 +22,6 @@ import (
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/cmd/utils"
- "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/tests"
@@ -103,7 +102,7 @@ func runBlockTest(ctx *cli.Context) {
func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, error) {
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx)
- cfg.NewDB = func(path string) (common.Database, error) { return ethdb.NewMemDatabase() }
+ cfg.NewDB = func(path string) (ethdb.Database, error) { return ethdb.NewMemDatabase() }
cfg.MaxPeers = 0 // disable network
cfg.Shh = false // disable whisper
cfg.NAT = nil // disable port mapping
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
index c42045918..c5bc4b66a 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/geth/chaincmd.go
@@ -29,6 +29,7 @@ import (
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger/glog"
)
@@ -191,7 +192,7 @@ func hashish(x string) bool {
return err != nil
}
-func closeAll(dbs ...common.Database) {
+func closeAll(dbs ...ethdb.Database) {
for _, db := range dbs {
db.Close()
}
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
index 67c36dfe7..2fd5a531d 100644
--- a/cmd/geth/js_test.go
+++ b/cmd/geth/js_test.go
@@ -103,7 +103,7 @@ func testREPL(t *testing.T, config func(*eth.Config)) (string, *testjethre, *eth
Name: "test",
SolcPath: testSolcPath,
PowTest: true,
- NewDB: func(path string) (common.Database, error) { return db, nil },
+ NewDB: func(path string) (ethdb.Database, error) { return db, nil },
}
if config != nil {
config(conf)