feat: Redeem unit testing

Signed-off-by: Allon Adir <adir@il.ibm.com>

Author: aaadir

token/core/fabtoken/v1/actions/transfer_test.go

@@ -273,3 +273,12 @@ func TestTransferAction_Serialization(t *testing.T) {
 	assert.NoError(t, err, "failed to deserialize a new transfer action")
 	assert.Equal(t, action2, action3, "deserialized action is not equal to the original one")
 }
+
+func TestTransferAction_GetIssuer(t *testing.T) {
+	issuerId := []byte("issuer")
+	action := &TransferAction{
+		Issuer: issuerId,
+	}
+	issuer := action.GetIssuer()
+	assert.True(t, issuer.Equal(issuerId), "unexpected issuer id in TransferAction")
+}

token/core/fabtoken/v1/setup/setup_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
-
 	"github.com/stretchr/testify/assert"
 )
 

token/core/fabtoken/v1/transfer.go

@@ -46,7 +46,6 @@ func NewTransferService(
 // Transfer returns a TransferAction as a function of the passed arguments
 // It also returns the corresponding TransferMetadata
 func (s *TransferService) Transfer(ctx context.Context, _ string, _ driver.OwnerWallet, tokenIDs []*token.ID, Outputs []*token.Token, opts *driver.TransferOptions) (driver.TransferAction, *driver.TransferMetadata, error) {
-	var isRedeem bool
 	// select inputs
 	inputTokens, err := s.TokenLoader.GetTokens(tokenIDs)
 	if err != nil {
@@ -61,6 +60,7 @@ func (s *TransferService) Transfer(ctx context.Context, _ string, _ driver.Owner
 	}
 
 	// prepare outputs
+	var isRedeem bool
 	var outs []*actions.Output
 	for _, output := range Outputs {
 		outs = append(outs, &actions.Output{

token/core/fabtoken/v1/validator/validator_transfer.go

@@ -30,7 +30,6 @@ func TransferSignatureValidate(ctx *Context) error {
 		return errors.Errorf("invalid number of token inputs, expected at least 1")
 	}
 
-	var isRedeem bool
 	var inputToken []*actions.Output
 	for _, in := range ctx.TransferAction.Inputs {
 		tok := in.Input
@@ -51,6 +50,7 @@ func TransferSignatureValidate(ctx *Context) error {
 		ctx.Signatures = append(ctx.Signatures, sigma)
 	}
 
+	var isRedeem bool
 	for _, output := range ctx.TransferAction.Outputs {
 		if output.Owner == nil {
 			isRedeem = true

token/core/zkatdlog/nogh/v1/transfer/action_test.go

@@ -379,6 +379,7 @@ func TestAction_Validate(t *testing.T) {
 						Data:  &math.G1{},
 					},
 				},
+				Issuer: []byte("issuer"),
 			},
 			wantErr: false,
 		},
@@ -488,5 +489,15 @@ func randomAction(curve *math.Curve, rand io.Reader, b assert.TestingT) *Action
 		"key1": getRandomBytes(b, 32),
 		"key2": getRandomBytes(b, 32),
 	}
+	action.Issuer = getRandomBytes(b, 32)
 	return action
 }
+
+func TestAction_GetIssuer(t *testing.T) {
+	issuerId := []byte("issuer")
+	action := &Action{
+		Issuer: issuerId,
+	}
+	issuer := action.GetIssuer()
+	assert.True(t, issuer.Equal(issuerId), "unexpected issuer id in Action")
+}

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

@@ -65,7 +65,7 @@ func TransferSignatureValidate(ctx *Context) error {
 	}
 
 	if isRedeem {
-		ctx.Logger.Infof("action is a redeem, verify the signature of the issuer")
+		ctx.Logger.Debugf("action is a redeem, verify the signature of the issuer")
 
 		issuer := ctx.TransferAction.GetIssuer()
 		if issuer == nil {

token/driver/request_test.go

@@ -126,6 +126,7 @@ func TestTokenRequestMetadataSerialization(t *testing.T) {
 					[]byte("extra_signer1"),
 					[]byte("extra_signer2"),
 				},
+				Issuer: Identity([]byte("issuer")),
 			},
 		},
 		Application: map[string][]byte{

token/services/ttx/transfer_opts.go

@@ -18,6 +18,8 @@ const (
 	IssuerFSCIdentityKey = "IssuerFSCIdentityKey"
 )
 
+// WithFSCIssuerIdentity takes an issuer's node Identity
+// and sets the appropriate attribute in a TransferOptions struct
 func WithFSCIssuerIdentity(issuerFSCIdentity view.Identity) token.TransferOption {
 	return func(options *token.TransferOptions) error {
 		if options.Attributes == nil {
@@ -28,6 +30,8 @@ func WithFSCIssuerIdentity(issuerFSCIdentity view.Identity) token.TransferOption
 	}
 }
 
+// GetFSCIssuerIdentityFromOpts extracts an issuer's node identity
+// from the appropriate attribute in a given attribute map.
 func GetFSCIssuerIdentityFromOpts(attributes map[interface{}]interface{}) (view.Identity, error) {
 	if attributes == nil {
 		return nil, nil