aboutsummaryrefslogtreecommitdiffstats
path: root/common
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 /common
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 'common')
-rw-r--r--common/db.go26
-rw-r--r--common/natspec/natspec_e2e_test.go2
2 files changed, 1 insertions, 27 deletions
diff --git a/common/db.go b/common/db.go
deleted file mode 100644
index 60c090cdc..000000000
--- a/common/db.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package common
-
-// Database interface
-type Database interface {
- Put(key []byte, value []byte) error
- Get(key []byte) ([]byte, error)
- Delete(key []byte) error
- Close()
- Flush() error
-}
diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go
index fc8ca6af2..ea28b457e 100644
--- a/common/natspec/natspec_e2e_test.go
+++ b/common/natspec/natspec_e2e_test.go
@@ -143,7 +143,7 @@ func testEth(t *testing.T) (ethereum *eth.Ethereum, err error) {
MaxPeers: 0,
PowTest: true,
Etherbase: common.HexToAddress(testAddress),
- NewDB: func(path string) (common.Database, error) { return db, nil },
+ NewDB: func(path string) (ethdb.Database, error) { return db, nil },
})
if err != nil {