Remove unneeded multi getter

cache/cache.go

@@ -16,13 +16,9 @@
 // store content on a pbgopy server.
 package cache
 
-import (
-	"errors"
-)
+import "errors"
 
-var (
-	ErrNotFound = errors.New("not found")
-)
+var ErrNotFound = errors.New("not found")
 
 // Getter wraps a method to read from cache.
 type Getter interface {
@@ -45,42 +41,3 @@ type Cache interface {
 	Putter
 	Deleter
 }
-
-type multiGetter struct {
-	getters []Getter
-}
-
-// MultiGetter combines a lit of getters into a single getter.
-func MultiGetter(getters ...Getter) Getter {
-	all := make([]Getter, 0, len(getters))
-	for _, r := range getters {
-		if mg, ok := r.(*multiGetter); ok {
-			all = append(all, mg.getters...)
-		} else {
-			all = append(all, r)
-		}
-	}
-	return &multiGetter{
-		getters: all,
-	}
-}
-
-func (mg *multiGetter) Get(key interface{}) (interface{}, error) {
-	if len(mg.getters) == 0 {
-		return nil, ErrNotFound
-	}
-	if len(mg.getters) == 1 {
-		return mg.getters[0].Get(key)
-	}
-	var firstErr error
-	for i := range mg.getters {
-		e, err := mg.getters[i].Get(key)
-		if firstErr == nil && err != nil {
-			firstErr = err
-		}
-		if err == nil {
-			return e, nil
-		}
-	}
-	return nil, firstErr
-}

commands/serve.go

@@ -34,8 +34,6 @@ type serveRunner struct {
 	ttl       time.Duration
 	basicAuth string
 
-	// random data used as an additional input for hashing data.
-	salt   []byte
 	cache  cache.Cache
 	stdout io.Writer
 	stderr io.Writer
@@ -97,7 +95,6 @@ func (r *serveRunner) newServer() *http.Server {
 }
 
 func (r *serveRunner) handle(w http.ResponseWriter, req *http.Request) {
-
 	switch req.Method {
 	case http.MethodGet:
 		data, err := r.cache.Get(dataCacheKey)

datasize/datasize.go

@@ -70,7 +70,7 @@ func (b ByteSize) EBytes() float64 {
 func (b ByteSize) String() string {
 	switch {
 	case b == 0:
-		return fmt.Sprint("0B")
+		return "0B"
 	case b%EB == 0:
 		return fmt.Sprintf("%dEB", b/EB)
 	case b%PB == 0:
@@ -134,7 +134,7 @@ ParseLoop:
 				goto Overflow
 			}
 
-			c = c - '0'
+			c -= '0'
 			val *= 10
 
 			if val > val+uint64(c) {