ethdb: small refactor to test file:

1.remove unused parameter
2.rename variable in camelCase way
This commit is contained in:
Lin Corey 2018-11-08 14:38:36 +08:00
parent cf3b187bde
commit c4298c95ee

View file

@ -46,7 +46,7 @@ func newTestLDB() (*ethdb.LDBDatabase, func()) {
} }
} }
var test_values = []string{"", "a", "1251", "\x00123\x00"} var testValues = []string{"", "a", "1251", "\x00123\x00"}
func TestLDB_PutGet(t *testing.T) { func TestLDB_PutGet(t *testing.T) {
db, remove := newTestLDB() db, remove := newTestLDB()
@ -61,14 +61,14 @@ func TestMemoryDB_PutGet(t *testing.T) {
func testPutGet(db ethdb.Database, t *testing.T) { func testPutGet(db ethdb.Database, t *testing.T) {
t.Parallel() t.Parallel()
for _, k := range test_values { for _, k := range testValues {
err := db.Put([]byte(k), nil) err := db.Put([]byte(k), nil)
if err != nil { if err != nil {
t.Fatalf("put failed: %v", err) t.Fatalf("put failed: %v", err)
} }
} }
for _, k := range test_values { for _, k := range testValues {
data, err := db.Get([]byte(k)) data, err := db.Get([]byte(k))
if err != nil { if err != nil {
t.Fatalf("get failed: %v", err) t.Fatalf("get failed: %v", err)
@ -83,14 +83,14 @@ func testPutGet(db ethdb.Database, t *testing.T) {
t.Fatalf("expect to return a not found error") t.Fatalf("expect to return a not found error")
} }
for _, v := range test_values { for _, v := range testValues {
err := db.Put([]byte(v), []byte(v)) err := db.Put([]byte(v), []byte(v))
if err != nil { if err != nil {
t.Fatalf("put failed: %v", err) t.Fatalf("put failed: %v", err)
} }
} }
for _, v := range test_values { for _, v := range testValues {
data, err := db.Get([]byte(v)) data, err := db.Get([]byte(v))
if err != nil { if err != nil {
t.Fatalf("get failed: %v", err) t.Fatalf("get failed: %v", err)
@ -100,14 +100,14 @@ func testPutGet(db ethdb.Database, t *testing.T) {
} }
} }
for _, v := range test_values { for _, v := range testValues {
err := db.Put([]byte(v), []byte("?")) err := db.Put([]byte(v), []byte("?"))
if err != nil { if err != nil {
t.Fatalf("put override failed: %v", err) t.Fatalf("put override failed: %v", err)
} }
} }
for _, v := range test_values { for _, v := range testValues {
data, err := db.Get([]byte(v)) data, err := db.Get([]byte(v))
if err != nil { if err != nil {
t.Fatalf("get failed: %v", err) t.Fatalf("get failed: %v", err)
@ -117,7 +117,7 @@ func testPutGet(db ethdb.Database, t *testing.T) {
} }
} }
for _, v := range test_values { for _, v := range testValues {
orig, err := db.Get([]byte(v)) orig, err := db.Get([]byte(v))
if err != nil { if err != nil {
t.Fatalf("get failed: %v", err) t.Fatalf("get failed: %v", err)
@ -132,14 +132,14 @@ func testPutGet(db ethdb.Database, t *testing.T) {
} }
} }
for _, v := range test_values { for _, v := range testValues {
err := db.Delete([]byte(v)) err := db.Delete([]byte(v))
if err != nil { if err != nil {
t.Fatalf("delete %q failed: %v", v, err) t.Fatalf("delete %q failed: %v", v, err)
} }
} }
for _, v := range test_values { for _, v := range testValues {
_, err := db.Get([]byte(v)) _, err := db.Get([]byte(v))
if err == nil { if err == nil {
t.Fatalf("got deleted value %q", v) t.Fatalf("got deleted value %q", v)
@ -150,14 +150,14 @@ func testPutGet(db ethdb.Database, t *testing.T) {
func TestLDB_ParallelPutGet(t *testing.T) { func TestLDB_ParallelPutGet(t *testing.T) {
db, remove := newTestLDB() db, remove := newTestLDB()
defer remove() defer remove()
testParallelPutGet(db, t) testParallelPutGet(db)
} }
func TestMemoryDB_ParallelPutGet(t *testing.T) { func TestMemoryDB_ParallelPutGet(t *testing.T) {
testParallelPutGet(ethdb.NewMemDatabase(), t) testParallelPutGet(ethdb.NewMemDatabase())
} }
func testParallelPutGet(db ethdb.Database, t *testing.T) { func testParallelPutGet(db ethdb.Database) {
const n = 8 const n = 8
var pending sync.WaitGroup var pending sync.WaitGroup