cleanup

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

token/core/common/encoding/pp/pp.go

@@ -0,0 +1,19 @@
+package pp
+
+import (
+	"github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/driver/protos-go/pp"
+)
+
+// Marshal marshals the passed public parameters
+func Marshal(pp *pp.PublicParameters) ([]byte, error) {
+	return json.Marshal(pp)
+}
+
+func Unmarshal(raw []byte) (*pp.PublicParameters, error) {
+	pp := &pp.PublicParameters{}
+	if err := json.Unmarshal(raw, pp); err != nil {
+		return nil, err
+	}
+	return pp, nil
+}

token/core/zkatdlog/nogh/v1/setup.go

@@ -15,6 +15,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json"
+	pp3 "github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/pp"
 	math2 "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/protos-go/math"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/protos-go/pp"
 	utils2 "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/protos-go/utils"
@@ -309,16 +310,16 @@ func (p *PublicParams) Serialize() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	return json.Marshal(&pp2.PublicParameters{
+	return pp3.Marshal(&pp2.PublicParameters{
 		Identifier: p.Label,
 		Raw:        raw,
 	})
 }
 
 func (p *PublicParams) Deserialize(raw []byte) error {
-	container := &pp2.PublicParameters{}
-	if err := json.Unmarshal(raw, container); err != nil {
-		return err
+	container, err := pp3.Unmarshal(raw)
+	if err != nil {
+		return errors.Wrapf(err, "failed to deserialize public parameters")
 	}
 	if container.Identifier != p.Label {
 		return errors.Errorf("invalid identifier, expecting [%s], got [%s]", p.Label, container.Identifier)

token/core/zkatdlog/nogh/v1/validator/validator_transfer.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	math "github.com/IBM/mathlib"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/crypto/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/crypto/transfer"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
@@ -157,7 +156,7 @@ func TransferHTLCValidate(ctx *Context) error {
 		}
 		if owner.Type == htlc.ScriptType {
 			script := &htlc.Script{}
-			err = json.Unmarshal(owner.Identity, script)
+			err = script.FromBytes(owner.Identity)
 			if err != nil {
 				return err
 			}

token/services/interop/htlc/script.go

@@ -89,6 +89,10 @@ func (s *Script) Validate(timeReference time.Time) error {
 	return nil
 }
 
+func (s *Script) FromBytes(raw []byte) error {
+	return json.Unmarshal(raw, s)
+}
+
 // ScriptAuth implements the Authorization interface for this script
 type ScriptAuth struct {
 	WalletService driver.WalletService