5. Field Type Optimization and Consistency

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

Author: adecaro

cmd/tokengen/cobra/pp/fabtokenv1/gen.go

@@ -33,7 +33,7 @@ var (
 	// Auditors is the list of auditor MSP directories containing the corresponding auditor certificate.
 	Auditors []string
 	// Version allows the caller of tokengen to override the version number put in the public parameters.
-	Version uint
+	Version uint32
 	// Extras allows the caller to add extra parameters to the public parameters.
 	Extras []string
 )
@@ -46,7 +46,7 @@ func Cmd() *cobra.Command {
 	flags.BoolVarP(&GenerateCCPackage, "cc", "", false, "generate chaincode package")
 	flags.StringSliceVarP(&Auditors, "auditors", "a", nil, "list of auditor MSP directories containing the corresponding auditor certificate")
 	flags.StringSliceVarP(&Issuers, "issuers", "s", nil, "list of issuer MSP directories containing the corresponding issuer certificate")
-	flags.UintVarP(&Version, "version", "v", 0, "allows the caller of tokengen to override the version number put in the public params")
+	flags.Uint32VarP(&Version, "version", "v", 0, "allows the caller of tokengen to override the version number put in the public params")
 	flags.StringArrayVarP(&Extras, "extra", "x", []string{}, "extra data in key=value format, where value is the path to a file containing the data to load and store in the key")
 
 	return cobraCommand

cmd/tokengen/cobra/pp/zkatdlognoghv1/gen.go

@@ -39,7 +39,7 @@ type GeneratorArgs struct {
 	// Aries is a flag to indicate that aries should be used as backend for idemix
 	Aries bool
 	// Version allows the caller of tokengen to override the version number put in the public params
-	Version uint
+	Version uint32
 }
 
 var (
@@ -59,7 +59,7 @@ var (
 	// Aries is a flag to indicate that aries should be used as backend for idemix
 	Aries bool
 	// Version allows the caller of tokengen to override the version number put in the public params
-	Version uint
+	Version uint32
 	// Extras allows the caller to add extra parameters to the public parameters
 	Extras []string
 )
@@ -75,7 +75,7 @@ func Cmd() *cobra.Command {
 	flags.StringVarP(&IdemixMSPDir, "idemix", "i", "", "idemix msp dir")
 	flags.Uint64VarP(&BitLength, "bits", "b", 64, "bits is used to define the maximum quantity a token can contain")
 	flags.BoolVarP(&Aries, "aries", "r", false, "flag to indicate that aries should be used as backend for idemix")
-	flags.UintVarP(&Version, "version", "v", 0, "allows the caller of tokengen to override the version number put in the public params")
+	flags.Uint32VarP(&Version, "version", "v", 0, "allows the caller of tokengen to override the version number put in the public params")
 	flags.StringArrayVarP(&Extras, "extra", "x", []string{}, "extra data in key=value format, where value is the path to a file containing the data to load and store in the key")
 
 	return cobraCommand

cmd/tokengen/cobra/pp/zkatdlognoghv1/update.go

@@ -33,7 +33,7 @@ type UpdateArgs struct {
 	// Auditors is the list of auditor MSP directories containing the corresponding auditor certificate
 	Auditors []string
 	// Version allows the caller of tokengen to override the version number put in the public params
-	Version uint
+	Version uint32
 }
 
 // UpdateCmd returns the Cobra Command for updating public parameters.
@@ -44,7 +44,7 @@ func UpdateCmd() *cobra.Command {
 	flags.StringVarP(&OutputDir, "output", "o", ".", "output folder")
 	flags.StringSliceVarP(&Auditors, "auditors", "a", nil, "list of auditor MSP directories containing the corresponding auditor certificate")
 	flags.StringSliceVarP(&Issuers, "issuers", "s", nil, "list of issuer MSP directories containing the corresponding issuer certificate")
-	flags.UintVarP(&Version, "version", "v", 0, "allows the caller of tokengen to override the version number put in the public params")
+	flags.Uint32VarP(&Version, "version", "v", 0, "allows the caller of tokengen to override the version number put in the public params")
 	flags.StringArrayVarP(&Extras, "extra", "x", []string{}, "extra data in key=value format, where is the path to a file containing the data to load and store in the key")
 
 	return cmd

token/core/fabtoken/protos-go/v1/actions/ftactions.pb.go

@@ -28,7 +28,7 @@ message TransferActionOutput {
 }
 
 message TransferAction {
-  uint64 version = 1;
+  uint32 version = 1;
   repeated TransferActionInput inputs = 2; // inputs
   repeated TransferActionOutput outputs = 3; // outputs
   map<string, bytes> metadata = 4; // Metadata contains the transfer action's metadata
@@ -45,7 +45,7 @@ message IssueActionOutput {
 }
 
 message IssueAction {
-  uint64 version = 1;
+  uint32 version = 1;
   fabric_token_sdk.token.driver.v1.Identity issuer = 2; // is the identity of issuer
   repeated IssueActionInput inputs = 3; // are the tokens to be redeemed by this issue action
   repeated IssueActionOutput outputs = 4; // are the newly issued tokens

token/core/fabtoken/protos-go/v1/pp/ftpp.pb.go

@@ -15,7 +15,7 @@ option go_package = "github.com/hyperledger-labs/fabric-token-sdk/token/core/fab
 // PublicParameters describes typed public parameters
 message PublicParameters {
   string token_driver_name = 1; // the name of the token driver
-  uint64 token_driver_version = 2; // the version of token driver
+  uint32 token_driver_version = 2; // the version of token driver
   fabric_token_sdk.token.driver.v1.Identity auditor = 3; // is the public key of the auditor.
   repeated fabric_token_sdk.token.driver.v1.Identity issuers = 4; // is a list of public keys of the entities that can issue tokens.
   uint64 max_token = 5; // is the maximum quantity a token can hold

token/core/fabtoken/protos/v1/ftactions.proto

@@ -131,7 +131,7 @@ func (p *PublicParams) Bytes() ([]byte, error) {
 
 	params := &fabpp.PublicParameters{
 		TokenDriverName:    string(p.DriverName),
-		TokenDriverVersion: uint64(p.DriverVersion),
+		TokenDriverVersion: uint32(p.DriverVersion),
 		Auditor: &driverv1.Identity{
 			Raw: p.Auditor,
 		},