Merge pull request #1272 from mesg-foundation/refactor/servcie-proto-…

…hash-type

Use hash.Hash type in service proto definition

core/main.go

@@ -23,7 +23,6 @@ import (
 	"github.com/mesg-foundation/engine/x/xnet"
 	"github.com/mesg-foundation/engine/x/xos"
 	"github.com/mesg-foundation/engine/x/xsignal"
-	"github.com/mr-tron/base58"
 	"github.com/sirupsen/logrus"
 	db "github.com/tendermint/tm-db"
 )
@@ -74,7 +73,7 @@ func deployCoreServices(cfg *config.Config, sdk *enginesdk.SDK) error {
 				return err
 			}
 		}
-		logrus.WithField("module", "main").Infof("Service %q deployed with hash %q", srv.Sid, base58.Encode(srv.Hash))
+		logrus.WithField("module", "main").Infof("Service %q deployed with hash %q", srv.Sid, srv.Hash.String())
 		instance, err := sdk.Instance.Create(srv.Hash, xos.EnvMapToSlice(serviceConfig.Env))
 		if err != nil {
 			existsError, ok := err.(*instancesdk.AlreadyExistsError)

hash/hash.go

@@ -95,6 +95,11 @@ func (h Hash) Marshal() ([]byte, error) {
 	return h, nil
 }
 
+// MarshalTo marshals hash into slice of bytes. It's used by protobuf.
+func (h Hash) MarshalTo(data []byte) (int, error) {
+	return copy(data, h), nil
+}
+
 // Unmarshal unmarshals slice of bytes into hash. It's used by protobuf.
 func (h *Hash) Unmarshal(data []byte) error {
 	*h = data

protobuf/types/service.proto

@@ -178,7 +178,9 @@ message Service {
 
   // Service's hash.
   bytes hash = 10 [
-    (gogoproto.moretags) = 'validate:"required"'
+    (gogoproto.moretags) = 'validate:"required"',
+    (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash",
+    (gogoproto.nullable) = false
   ];
 
   // Service's sid.

sdk/instance/start.go

@@ -5,7 +5,6 @@ import (
 	"github.com/mesg-foundation/engine/instance"
 	"github.com/mesg-foundation/engine/service"
 	"github.com/mesg-foundation/engine/x/xos"
-	"github.com/mr-tron/base58"
 )
 
 // Start starts the service.
@@ -39,7 +38,7 @@ func (i *Instance) start(inst *instance.Instance, imageHash string, env []string
 			Labels: map[string]string{
 				"mesg.engine":     i.engineName,
 				"mesg.sid":        srv.Sid,
-				"mesg.service":    base58.Encode(srv.Hash), // TODO: change to srv.Hash.String() after set custom type in proto
+				"mesg.service":    srv.Hash.String(),
 				"mesg.instance":   inst.Hash.String(),
 				"mesg.dependency": d.Key,
 			},
@@ -67,7 +66,7 @@ func (i *Instance) start(inst *instance.Instance, imageHash string, env []string
 		Labels: map[string]string{
 			"mesg.engine":     i.engineName,
 			"mesg.sid":        srv.Sid,
-			"mesg.service":    base58.Encode(srv.Hash), // TODO: change to srv.Hash.String() after set custom type in proto
+			"mesg.service":    srv.Hash.String(),
 			"mesg.instance":   inst.Hash.String(),
 			"mesg.dependency": service.MainServiceKey,
 		},