Remove the use of codec.MustMarshal when not needed

mesg-foundation · Nov 8, 2019 · 68aba4d · 68aba4d
1 parent 5aa8278
commit 68aba4d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/sdk/instance/backend.go b/sdk/instance/backend.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	cosmostypes "github.com/cosmos/cosmos-sdk/types"
+	"github.com/mesg-foundation/engine/codec"
 	"github.com/mesg-foundation/engine/cosmos"
 	"github.com/mesg-foundation/engine/hash"
 	"github.com/mesg-foundation/engine/instance"
@@ -67,7 +68,11 @@ func (s *Backend) FetchOrCreate(request cosmostypes.Request, serviceHash hash.Ha
 	inst.Hash = hash.Dump(inst)
 
 	if store := request.KVStore(s.storeKey); !store.Has(inst.Hash) {
-		store.Set(inst.Hash, codec.MustMarshalBinaryBare(inst))
+		value, err := codec.MarshalBinaryBare(inst)
+		if err != nil {
+			return nil, err
+		}
+		store.Set(inst.Hash, value)
 	}
 
 	return inst, nil

diff --git a/sdk/ownership/backend.go b/sdk/ownership/backend.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	cosmostypes "github.com/cosmos/cosmos-sdk/types"
+	"github.com/mesg-foundation/engine/codec"
 	"github.com/mesg-foundation/engine/cosmos"
 	"github.com/mesg-foundation/engine/hash"
 	"github.com/mesg-foundation/engine/ownership"
@@ -64,7 +65,11 @@ func (s *Backend) CreateServiceOwnership(request cosmostypes.Request, serviceHas
 		},
 	}
 	ownership.Hash = hash.Dump(ownership)
-	store.Set(ownership.Hash, codec.MustMarshalBinaryBare(ownership))
+	value, err := codec.MarshalBinaryBare(ownership)
+	if err != nil {
+		return nil, err
+	}
+	store.Set(ownership.Hash, value)
 	return ownership, nil
 }
 

diff --git a/sdk/service/backend.go b/sdk/service/backend.go
@@ -6,6 +6,7 @@ import (
 
 	cosmostypes "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gogo/protobuf/proto"
+	"github.com/mesg-foundation/engine/codec"
 	"github.com/mesg-foundation/engine/cosmos"
 	"github.com/mesg-foundation/engine/hash"
 	"github.com/mesg-foundation/engine/protobuf/api"
@@ -106,7 +107,11 @@ func (s *Backend) Create(request cosmostypes.Request, msg *msgCreateService) (*s
 		return nil, err
 	}
 
-	store.Set(srv.Hash, codec.MustMarshalBinaryBare(srv))
+	value, err := codec.MarshalBinaryBare(srv)
+	if err != nil {
+		return nil, err
+	}
+	store.Set(srv.Hash, value)
 	return srv, nil
 }