Roll infra/go/src/github.com/luci/luci-go/ to b85c6dd748361e8244122faac44b5beefcd2db37.

go/src/infra/gae/libs/wrapper/memory/testing_utils_test.go

Index: go/src/infra/gae/libs/wrapper/memory/testing_utils_test.go
diff --git a/go/src/infra/gae/libs/wrapper/memory/testing_utils_test.go b/go/src/infra/gae/libs/wrapper/memory/testing_utils_test.go
index 2e172bcabaf2e8def826100fbe80a52374ba8593..59fc990dbf2174e07c9447c6be1615fbbe7071fe 100644
--- a/go/src/infra/gae/libs/wrapper/memory/testing_utils_test.go
+++ b/go/src/infra/gae/libs/wrapper/memory/testing_utils_test.go
@@ -12,7 +12,7 @@ import (
 
 	"appengine/datastore"
 
-	"github.com/luci/luci-go/common/funnybase"
+	"github.com/luci/luci-go/common/cmpbin"
 )
 
 type kv struct{ k, v []byte }
@@ -81,9 +81,9 @@ func cat(bytethings ...interface{}) []byte {
 	for _, thing := range bytethings {
 		switch x := thing.(type) {
 		case int, int64:
-			funnybase.Write(buf, reflect.ValueOf(x).Int())
+			cmpbin.WriteInt(buf, reflect.ValueOf(x).Int())
 		case uint, uint64:
-			funnybase.WriteUint(buf, reflect.ValueOf(x).Uint())
+			cmpbin.WriteUint(buf, reflect.ValueOf(x).Uint())
 		case float64:
 			writeFloat64(buf, x)
 		case byte, propValType: