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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package memory
 
 import (
         "bytes"
         "fmt"
         "reflect"
         "time"
 
         "appengine/datastore"
 
-        "github.com/luci/luci-go/common/funnybase"
+        "github.com/luci/luci-go/common/cmpbin"
 )
 
 type kv struct{ k, v []byte }
 
 func indx(kind string, orders ...string) *qIndex {
         ancestor := false
         if kind[len(kind)-1] == '!' {
                 ancestor = true
                 kind = kind[:len(kind)-1]
         }
@@ skipping 48 matching lines @@
         }
 }
 
 // cat is a convenience method for concatenating anything with an underlying
 // byte representation into a single []byte.
 func cat(bytethings ...interface{}) []byte {
         buf := &bytes.Buffer{}
         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:
                         buf.WriteByte(byte(reflect.ValueOf(x).Uint()))
                 case []byte, serializedPval:
                         buf.Write(reflect.ValueOf(x).Convert(byteSliceType).Interface().([]byte))
                 case string:
                         writeString(buf, x)
                 case time.Time:
                         writeTime(buf, x)
@@ skipping 16 matching lines @@
         ret := cat(bytethings...)
         for i := range ret {
                 ret[i] ^= 0xFF
         }
         return ret
 }
 
 func sat(bytethings ...interface{}) string {
         return string(cat(bytethings...))
 }