.

wcfs/internal/xbtree/xbtreetest/treeenv.go

@@ -266,6 +266,16 @@ func (t *Commit) XGetBlkData(oid zodb.Oid) string {
 	return zblki.Data
 }
 
+// XGetBlkByName returns ZBlk info associated with ZBlk<name>
+func (t *Commit) XGetBlkByName(name string) (zodb.Oid, ZBlkInfo) {
+	for oid, zblki := range t.ZBlkTab {
+		if zblki.Name == name {
+			return oid, zblki
+		}
+	}
+	panicf("ZBlk<%q> not found", name)
+	return zodb.InvalidOid, ZBlkInfo{} // XXX should be not needed
+}
 
 // xGetTree loads Tree from zurl@at->obj<root>.
 //

wcfs/internal/xbtree/δbtail_test.go

@@ -1260,17 +1260,6 @@ func TestΔBtailSliceByRootRev(t_ *testing.T) {
 		t.Errorf("%s:\nhave: %s\nwant: %s", subj, have, want)
 	}
 
-	// zblkByName returns oid of ZBlk that has .Name == name
-	zblkByName := func(name string) zodb.Oid {
-		for oid, zblki := range t0.ZBlkTab {
-			if zblki.Name == name {
-				return oid
-			}
-		}
-		panicf("ZBlk<%q> not found", name)
-		return zodb.InvalidOid // XXX should be not needed
-	}
-
 	s00 := δbtail.SliceByRootRev(t.Root(), t0.At, t0.At)
 	s01 := δbtail.SliceByRootRev(t.Root(), t0.At, t1.At)
 	s02 := δbtail.SliceByRootRev(t.Root(), t0.At, t2.At)
@@ -1286,8 +1275,8 @@ func TestΔBtailSliceByRootRev(t_ *testing.T) {
 	assertvδT("t2.s22",  s22)
 
 	// sXX should be all aliased to vδT
-	gg := zblkByName("g")
-	hh := zblkByName("h")
+	gg, _ := t0.XGetBlkByName("g")
+	hh, _ := t0.XGetBlkByName("h")
 	vδT[0].Rev = t0.At; δkv0 := vδT[0].ΔKV; vδT[0].ΔKV = map[Key]ΔValue{11:{gg,gg}}
 	vδT[1].Rev = t0.At; δkv1 := vδT[1].ΔKV; vδT[1].ΔKV = map[Key]ΔValue{12:{hh,hh}}
 	assertvδT("t2.vδT*", vδT,        ΔT{t0.At, δ{11:{g,g}}},  ΔT{t0.At, δ{12:{h,h}}})
@@ -1331,8 +1320,8 @@ func TestΔBtailSliceByRootRev(t_ *testing.T) {
 	assertvδT("t12.s22_",  s22_)
 
 	// sXX_ should be all aliased to vδT, but not sXX
-	bb := zblkByName("b")
-	cc := zblkByName("c")
+	bb, _ := t0.XGetBlkByName("b")
+	cc, _ := t0.XGetBlkByName("c")
 	vδT[0].Rev = t0.At; δkv0 = vδT[0].ΔKV; vδT[0].ΔKV = map[Key]ΔValue{111:{bb,bb}}
 	vδT[1].Rev = t0.At; δkv1 = vδT[1].ΔKV; vδT[1].ΔKV = map[Key]ΔValue{112:{cc,cc}}
 	assertvδT("t12.vδT*",  vδT,     ΔT{t0.At, δ{111:{b,b}}},        ΔT{t0.At, δ{112:{c,c}}})