1 files changed, 9 insertions, 9 deletions

diff --git a/tests/dedo.go b/tests/dedo.go
index 245eb07..efb386f 100644
--- a/tests/dedo.go
+++ b/tests/dedo.go
@@ -1347,7 +1347,7 @@ func TestBucket_DeleteBucket_Nested2(t *testing.T) {
 	}
 
 	err = db.View(func(snapshot SnapshotI) error {
-		if snapshot.Bucket([]byte("widgets")) != nil {
+		if snapshot.Bucket([]byte("widgets")) != /* nil FIXME */ (*bucketT)(nil) {
 			t.Fatal("expected bucket to be deleted")
 		}
 		return nil
@@ -1422,7 +1422,7 @@ func TestBucket_Bucket_IncompatibleValue(t *testing.T) {
 		}
 
 		b := tx.Bucket([]byte("widgets")).Bucket([]byte("foo"))
-		if b != nil {
+		if b != /* nil FIXME */ (*bucketT)(nil) {
 			t.Fatal("expected nil bucket")
 		}
 
@@ -5624,7 +5624,7 @@ func simulatePutHandler(tx *transactionT, qdb *QuickDB) {
 
 	// Retrieve root bucket.
 	b := tx.Bucket(keys[0])
-	if b == nil {
+	if b == /* nil FIXME */ (*bucketT)(nil) {
 		b, err = tx.CreateBucket(keys[0])
 		if err != nil {
 			panic("create bucket: " + err.Error())
@@ -5634,7 +5634,7 @@ func simulatePutHandler(tx *transactionT, qdb *QuickDB) {
 	// Create nested buckets, if necessary.
 	for _, key := range keys[1 : len(keys)-1] {
 		child := b.Bucket(key)
-		if child != nil {
+		if child != /* nil FIXME */ (*bucketT)(nil) {
 			b = child
 		} else {
 			b, err = b.CreateBucket(key)
@@ -6188,7 +6188,7 @@ func TestTx_DeleteBucket(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		if tx.Bucket([]byte("widgets")) != nil {
+		if tx.Bucket([]byte("widgets")) != /* nil FIXME */ (*bucketT)(nil) {
 			t.Fatal("unexpected bucket")
 		}
 
@@ -6297,7 +6297,7 @@ func TestTx_ForEach_NoError(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		err = tx.ForEach(func(name []byte, b *bucketT) error {
+		err = tx.ForEach(func(name []byte, b BucketI) error {
 			return nil
 		})
 		if err != nil {
@@ -6329,7 +6329,7 @@ func TestTx_ForEach_WithError(t *testing.T) {
 		}
 
 		marker := errors.New("marker")
-		err = tx.ForEach(func(name []byte, b *bucketT) error {
+		err = tx.ForEach(func(name []byte, b BucketI) error {
 			return marker
 		})
 		if err != marker {
@@ -6603,7 +6603,7 @@ func fillBucket(b *bucketT, prefix []byte) error {
 	n = 1 + rand.Intn(3)
 	for i := 0; i < n; i++ {
 		k := append(prefix, []byte(fmt.Sprintf("b%d", i))...)
-		sb, err := b.CreateBucket(k)
+		sb, err := bucketCreateBucket(b, k)
 		if err != nil {
 			return err
 		}
@@ -6628,7 +6628,7 @@ func walkBucket(parent *bucketT, k []byte, v []byte, w io.Writer) error {
 	}
 	return parent.ForEach(func(k, v []byte) error {
 		if v == nil {
-			return walkBucket(parent.Bucket(k), k, nil, w)
+			return walkBucket(bucketGetNested(parent, k), k, nil, w)
 		}
 		return walkBucket(parent, k, v, w)
 	})