Random fixes

Dockerfile.tools

@@ -3,10 +3,6 @@ FROM golang:1.13.0-stretch
 
 WORKDIR /project
 
-# install dependencies
-COPY go.mod go.sum ./
-RUN go mod download
-
 VOLUME /project
 
 # install some dependencies from apt-get.
@@ -38,6 +34,10 @@ RUN mkdir -p /usr/local/include/gogo/protobuf/ && \
     wget -qO- https://github.com/gogo/protobuf/archive/v${gogoprotobuf}.tar.gz | tar -xzf - protobuf-${gogoprotobuf}/gogoproto/gogo.proto && \
     mv protobuf-${gogoprotobuf}/gogoproto /usr/local/include/gogo/protobuf/
 
+# install dependencies
+COPY go.mod go.sum ./
+RUN go mod download
+
 RUN go install github.com/go-bindata/go-bindata/go-bindata
 RUN go install github.com/golang/protobuf/protoc-gen-go
 RUN go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc

database/process_db.go

@@ -1,6 +1,7 @@
 package database
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/gogo/protobuf/proto"
@@ -10,6 +11,10 @@ import (
 	"github.com/syndtr/goleveldb/leveldb"
 )
 
+var (
+	errCannotSaveProcessWithoutHash = errors.New("database: can't save process without hash")
+)
+
 // ProcessDB describes the API of database package.
 type ProcessDB interface {
 	// Save saves a process to database.
@@ -108,7 +113,7 @@ func (d *LevelDBProcessDB) Get(hash hash.Hash) (*process.Process, error) {
 // If there is an another process that uses the same sid, it'll be deleted.
 func (d *LevelDBProcessDB) Save(s *process.Process) error {
 	if s.Hash.IsZero() {
-		return errCannotSaveWithoutHash
+		return errCannotSaveProcessWithoutHash
 	}
 
 	b, err := d.marshal(s)

database/service_db.go

@@ -12,7 +12,7 @@ import (
 )
 
 var (
-	errCannotSaveWithoutHash = errors.New("database: can't save service without hash")
+	errCannotSaveServiceWithoutHash = errors.New("database: can't save service without hash")
 )
 
 // ServiceDB is a database for storing service definition.
@@ -33,7 +33,7 @@ func NewServiceDB(s store.Store, cdc *codec.Codec) *ServiceDB {
 func (d *ServiceDB) unmarshalService(hash hash.Hash, value []byte) (*service.Service, error) {
 	var s service.Service
 	if err := d.cdc.UnmarshalBinaryBare(value, &s); err != nil {
-		return nil, fmt.Errorf("database: could not decode service %q: %s", hash, err)
+		return nil, fmt.Errorf("database: could not decode service %q: %w", hash.String(), err)
 	}
 	return &s, nil
 }
@@ -82,7 +82,7 @@ func (d *ServiceDB) Get(hash hash.Hash) (*service.Service, error) {
 // If there is an another service that uses the same sid, it'll be deleted.
 func (d *ServiceDB) Save(s *service.Service) error {
 	if len(s.Hash) == 0 {
-		return errCannotSaveWithoutHash
+		return errCannotSaveServiceWithoutHash
 	}
 	b, err := d.cdc.MarshalBinaryBare(s)
 	if err != nil {

database/service_db_test.go

@@ -48,7 +48,7 @@ func TestServiceDBSave(t *testing.T) {
 	require.Len(t, ss, 2)
 
 	// test service without hash.
-	require.EqualError(t, db.Save(&service.Service{}), errCannotSaveWithoutHash.Error())
+	require.EqualError(t, db.Save(&service.Service{}), errCannotSaveServiceWithoutHash.Error())
 }
 
 func TestServiceDBGet(t *testing.T) {