kvdb/test: generalize etcd tests

kvdb/etcd/db_test.go

@@ -38,8 +38,8 @@ func TestCopy(t *testing.T) {
 	require.Nil(t, err)
 
 	expected := map[string]string{
-		bkey("apple"):        bval("apple"),
-		vkey("key", "apple"): "val",
+		BucketKey("apple"):        BucketVal("apple"),
+		ValueKey("key", "apple"): "val",
 	}
 	require.Equal(t, expected, f.Dump())
 }