.

wcfs/internal/xbtree/xbtreetest/init/init.go

@@ -30,14 +30,14 @@ import (
 	"lab.nexedi.com/kirr/go123/xerr"
 	"lab.nexedi.com/kirr/neo/go/zodb"
 
-	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xbtree"
+	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xbtree/xbtreetest"
 	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xzodb"
 	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/zdata"
 )
 
-type Tree = xbtree.Tree
-type Node = xbtree.Node
-type Key  = xbtree.Key
+type Tree = xbtreetest.Tree
+type Node = xbtreetest.Node
+type Key  = xbtreetest.Key
 
 type ZBlk = zdata.ZBlk
 
@@ -64,12 +64,12 @@ func ztreeGetBlk(ctx context.Context, ztree *Tree, k Key) (zblk ZBlk, ok bool, p
 
 
 func init() {
-	xbtree.ZTreeGetBlkData = ZTreeGetBlkData
-	xbtree.ZGetBlkData     = ZGetBlkData
+	xbtreetest.ZTreeGetBlkData = _ZTreeGetBlkData
+	xbtreetest.ZGetBlkData     = _ZGetBlkData
 }
 
-// ZTreeGetBlkData returns block data from block pointed to by ztree[k].
-func ZTreeGetBlkData(ctx context.Context, ztree *Tree, k Key) (data string, ok bool, path []Node, err error) {
+// _ZTreeGetBlkData returns block data from block pointed to by ztree[k].
+func _ZTreeGetBlkData(ctx context.Context, ztree *Tree, k Key) (data string, ok bool, path []Node, err error) {
 	defer xerr.Contextf(&err, "@%s: tree<%s>: get blkdata from [%d]", ztree.PJar().At(), ztree.POid(), k)
 
 	zblk, ok, path, err := ztreeGetBlk(ctx, ztree, k)
@@ -85,8 +85,8 @@ func ZTreeGetBlkData(ctx context.Context, ztree *Tree, k Key) (data string, ok b
 	return string(bdata), true, path, nil
 }
 
-// ZGetBlkData loads block data from ZBlk object specified by its oid.
-func ZGetBlkData(ctx context.Context, zconn *zodb.Connection, zblkOid zodb.Oid) (data string, err error) {
+// _ZGetBlkData loads block data from ZBlk object specified by its oid.
+func _ZGetBlkData(ctx context.Context, zconn *zodb.Connection, zblkOid zodb.Oid) (data string, err error) {
 	defer xerr.Contextf(&err, "@%s: get blkdata from obj %s", zconn.At(), zblkOid)
 
 	xblk, err := zconn.Get(ctx, zblkOid)

wcfs/internal/xbtree/δbtail_test.go

@@ -91,7 +91,7 @@ func _trackSetWithCov(rbs xbtreetest.RBucketSet, tracked setKey, outKeyCover *bl
 		}
 		// trackSet explicitly records only regular buckets.
 		// embedded buckets all have oid=zodb.InvalidOid and would lead to z
-		newNode := false
+//		newNode := false
 		if kb.Oid != zodb.InvalidOid {
 			trackSet.AddPath(kb.Path())
 /*