rebase fix

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

Author: adecaro

token/core/common/tokens.go

@@ -9,6 +9,7 @@ package common
 import (
 	"crypto/rand"
 
+	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/token"
 	"github.com/pkg/errors"
 )

token/core/zkatdlog/crypto/issue/issue.go

@@ -158,7 +158,7 @@ func (i *Action) Validate() error {
 	return nil
 }
 
-func (i *IssueAction) ExtraSigners() []driver.Identity {
+func (i *Action) ExtraSigners() []driver.Identity {
 	return nil
 }
 

token/core/zkatdlog/crypto/validator/validator_test.go

@@ -426,7 +426,7 @@ func prepareIssue(auditor *audit.Auditor, issuer *issue2.Issuer) (*driver.TokenR
 
 	metadata := driver.IssueMetadata{}
 	metadata.OutputsMetadata = marshalledinf
-	metadata.ReceiversAuditInfos = make([][]byte, len(issue.OutputTokens))
+	metadata.ReceiversAuditInfos = make([][]byte, len(issue.Outputs))
 	for i := 0; i < len(issue.Outputs); i++ {
 		metadata.ReceiversAuditInfos[i], err = auditInfo.Bytes()
 		Expect(err).NotTo(HaveOccurred())

token/core/zkatdlog/nogh/issue.go

@@ -154,7 +154,6 @@ func (s *IssueService) Issue(ctx context.Context, issuerIdentity driver.Identity
 	meta := &driver.IssueMetadata{
 		Issuer:              issuerSerializedIdentity,
 		TokenIDs:            tokenIDs,
-		Outputs:             outputs,
 		OutputsMetadata:     outputsMetadata,
 		Receivers:           []driver.Identity{driver.Identity(owners[0])},
 		ReceiversAuditInfos: auditInfo,

token/driver/request.go

@@ -46,8 +46,6 @@ type IssueMetadata struct {
 	// TokenIDs is the list of TokenIDs spent by this action
 	TokenIDs []*token.ID
 
-	// Outputs is the list of outputs issued
-	Outputs [][]byte
 	// OutputsMetadata, for each output we have a OutputsMetadata entry that contains secrets to de-obfuscate the output
 	OutputsMetadata [][]byte
 	// Receivers, for each output we have a receiver
@@ -147,7 +145,6 @@ func (m *TokenRequestMetadata) Bytes() ([]byte, error) {
 		issues[i] = IssueMetadataSer{
 			Issuer:              issue.Issuer,
 			TokenIDs:            TokenIDs,
-			Outputs:             issue.Outputs,
 			OutputsMetadata:     issue.OutputsMetadata,
 			Receivers:           issue.Receivers,
 			ReceiversAuditInfos: issue.ReceiversAuditInfos,
@@ -206,7 +203,6 @@ func (m *TokenRequestMetadata) FromBytes(raw []byte) error {
 		m.Issues[i] = IssueMetadata{
 			Issuer:              issue.Issuer,
 			TokenIDs:            TokenIDs,
-			Outputs:             issue.Outputs,
 			OutputsMetadata:     issue.OutputsMetadata,
 			Receivers:           issue.Receivers,
 			ReceiversAuditInfos: issue.ReceiversAuditInfos,

token/metadata.go

@@ -185,9 +185,6 @@ func (m *IssueMetadata) Match(action *IssueAction) error {
 	}
 
 	// check outputs
-	if len(m.Outputs) != 1 {
-		return errors.Errorf("expected one output, got [%d]", len(m.Outputs))
-	}
 	if len(m.OutputsMetadata) != action.NumOutputs() {
 		return errors.Errorf("expected [%d] outputs but got [%d]", len(m.OutputsMetadata), action.NumOutputs())
 	}