add default driver version for generators

Signed-off-by: Arne Rutjes <arne123@gmail.com>

Author: arner

integration/nwo/token/generators/pp/fabtokenv1/gen.go

@@ -20,18 +20,16 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/x509"
 )
 
+const DefaultDriverVersion = setup.ProtocolV1
+
 type FabTokenPublicParamsGenerator struct {
 	DriverVersion driver.TokenDriverVersion
 }
 
 func NewFabTokenPublicParamsGenerator(version driver.TokenDriverVersion) *FabTokenPublicParamsGenerator {
-	gen := &FabTokenPublicParamsGenerator{
-		DriverVersion: setup.ProtocolV1,
-	}
-	if version > 0 {
-		gen.DriverVersion = version
+	return &FabTokenPublicParamsGenerator{
+		DriverVersion: version,
 	}
-	return gen
 }
 
 func (f *FabTokenPublicParamsGenerator) Generate(tms *topology.TMS, wallets *topology.Wallets, args ...interface{}) ([]byte, error) {

integration/nwo/token/generators/pp/zkatdlognoghv1/gen.go

@@ -25,18 +25,19 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/x509"
 )
 
+const DefaultDriverVersion = setup.ProtocolV1
+
 type DLogPublicParamsGenerator struct {
 	DefaultCurveID math3.CurveID
 	DriverVersion  driver.TokenDriverVersion
 }
 
 // NewDLogPublicParamsGenerator creates a new generator. The version is optional and defaults to v1.
 func NewDLogPublicParamsGenerator(defaultCurveID math3.CurveID, version driver.TokenDriverVersion) *DLogPublicParamsGenerator {
-	gen := &DLogPublicParamsGenerator{DefaultCurveID: defaultCurveID, DriverVersion: setup.ProtocolV1}
-	if version > 0 {
-		gen.DriverVersion = version
+	return &DLogPublicParamsGenerator{
+		DefaultCurveID: defaultCurveID,
+		DriverVersion:  version,
 	}
-	return gen
 }
 
 func (d *DLogPublicParamsGenerator) Generate(tms *topology.TMS, wallets *topology.Wallets, args ...interface{}) ([]byte, error) {

integration/nwo/token/platform.go

@@ -25,8 +25,8 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/crypto/fabtokenv1"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/crypto/zkatdlognoghv1"
-	fabtokenv2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/pp/fabtokenv1"
-	common2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/pp/zkatdlognoghv1"
+	fabtokengen "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/pp/fabtokenv1"
+	zkatgen "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/pp/zkatdlognoghv1"
 	topology2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
@@ -84,8 +84,8 @@ func NewPlatform(ctx api2.Context, t api2.Topology, builder api2.Builder) *Platf
 		TokenGenPath:           DefaultTokenGenPath,
 		NetworkHandlers:        map[string]NetworkHandler{},
 	}
-	p.PublicParamsGenerators[fabtokenv1.DriverIdentifier] = fabtokenv2.NewFabTokenPublicParamsGenerator(0)
-	p.PublicParamsGenerators[zkatdlognoghv1.DriverIdentifier] = common2.NewDLogPublicParamsGenerator(math3.BN254, 0)
+	p.PublicParamsGenerators[fabtokenv1.DriverIdentifier] = fabtokengen.NewFabTokenPublicParamsGenerator(fabtokengen.DefaultDriverVersion)
+	p.PublicParamsGenerators[zkatdlognoghv1.DriverIdentifier] = zkatgen.NewDLogPublicParamsGenerator(math3.BN254, zkatgen.DefaultDriverVersion)
 
 	return p
 }