fabtoken driver: custom IssueExtraValidators and AuditingExtraValidators. #1139 (#1148)

Signed-off-by: Angelo De Caro <[email protected]>

Author: adecaro

token/core/fabtoken/v1/driver/base.go

@@ -37,7 +37,7 @@ func (d *base) PublicParametersFromBytes(params []byte) (driver.PublicParameters
 func (d *base) DefaultValidator(pp driver.PublicParameters) (driver.Validator, error) {
 	logger := logging.DriverLoggerFromPP("token-sdk.driver.fabtoken", string(core.DriverIdentifierFromPP(pp)))
 	deserializer := NewDeserializer()
-	return validator.NewValidator(logger, pp.(*core2.PublicParams), deserializer), nil
+	return validator.NewValidator(logger, pp.(*core2.PublicParams), deserializer, nil, nil, nil), nil
 }
 
 func (d *base) newWalletService(

token/core/fabtoken/v1/service.go

@@ -66,5 +66,5 @@ func NewService(
 }
 
 func (s *Service) Validator() (driver.Validator, error) {
-	return validator.NewValidator(s.Logger, s.PublicParametersManager.PublicParams(context.Background()), s.Deserializer()), nil
+	return validator.NewValidator(s.Logger, s.PublicParametersManager.PublicParams(context.Background()), s.Deserializer(), nil, nil, nil), nil
 }

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

@@ -48,24 +48,33 @@ type Context = common.Context[*setup.PublicParams, *actions.Output, *actions.Tra
 
 type Validator = common.Validator[*setup.PublicParams, *actions.Output, *actions.TransferAction, *actions.IssueAction, driver.Deserializer]
 
-func NewValidator(logger logging.Logger, pp *setup.PublicParams, deserializer driver.Deserializer, extraValidators ...ValidateTransferFunc) *Validator {
+func NewValidator(
+	logger logging.Logger,
+	pp *setup.PublicParams,
+	deserializer driver.Deserializer,
+	extraTransferValidators []ValidateTransferFunc,
+	extraIssuerValidators []ValidateIssueFunc,
+	extraAuditorValidators []ValidateAuditingFunc,
+) *Validator {
 	transferValidators := []ValidateTransferFunc{
 		TransferActionValidate,
 		TransferSignatureValidate,
 		TransferBalanceValidate,
 		TransferHTLCValidate,
 		common.TransferApplicationDataValidate[*setup.PublicParams, *actions.Output, *actions.TransferAction, *actions.IssueAction, driver.Deserializer],
 	}
-	transferValidators = append(transferValidators, extraValidators...)
+	transferValidators = append(transferValidators, extraTransferValidators...)
 
 	issueValidators := []ValidateIssueFunc{
 		IssueValidate,
 		common.IssueApplicationDataValidate[*setup.PublicParams, *actions.Output, *actions.TransferAction, *actions.IssueAction, driver.Deserializer],
 	}
+	issueValidators = append(issueValidators, extraIssuerValidators...)
 
 	auditingValidators := []ValidateAuditingFunc{
 		common.AuditingSignaturesValidate[*setup.PublicParams, *actions.Output, *actions.TransferAction, *actions.IssueAction, driver.Deserializer],
 	}
+	auditingValidators = append(auditingValidators, extraAuditorValidators...)
 
 	return common.NewValidator[*setup.PublicParams, *actions.Output, *actions.TransferAction, *actions.IssueAction, driver.Deserializer](
 		logger,