refactor(identity): change IdentityType from string to int32 (#1450)

Signed-off-by: Siddhi Khandelwal <siddhi.200727@gmail.com>
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: sid200727

.gitignore

@@ -3,4 +3,6 @@
 *.iml
 
 go.work
-go.work.sumfabric-samples/
+go.work.sum
+fabric-samples/
+fabric-smart-client/

.goimportsignore

@@ -0,0 +1 @@
+fabric-smart-client/

cmd/tokengen/main_test.go

@@ -42,9 +42,9 @@ func TestGenFullSuccess(t *testing.T) {
 	gt.Expect(err).NotTo(HaveOccurred())
 	defer gexec.CleanupBuildArtifacts()
 
-	tempOutput := t.TempDir()
-	defer utils.IgnoreErrorWithOneArg(os.RemoveAll, tempOutput)
-
+	// tempOutput := t.TempDir()
+	// defer utils.IgnoreErrorWithOneArg(os.RemoveAll, tempOutput)
+	tempOutput := "./testdata"
 	testGenRun(
 		gt,
 		tokengen,
@@ -198,7 +198,7 @@ func TestPartialUpdate(t *testing.T) {
 		"./testdata/auditors/msp",
 		"./testdata/idemix/msp/IssuerPublicKey",
 		v1.ProtocolV1,
-		false,
+		true,
 	)
 }
 
@@ -238,7 +238,7 @@ func TestPartialUpdateWithVersion(t *testing.T) {
 		"./testdata/auditors/msp",
 		"./testdata/idemix/msp/IssuerPublicKey",
 		driver.TokenDriverVersion(2),
-		false,
+		true,
 	)
 }
 

cmd/tokengen/testdata/zkatdlognoghv1_pp.json

@@ -22,7 +22,8 @@ const (
 )
 
 func pathExists(path string) bool {
-	if _, err := os.Stat(filepath.Clean(path)); os.IsNotExist(err) { //nolint:gosec
+	//nolint:gosec // this is an integration test utility
+	if _, err := os.Stat(filepath.Clean(path)); os.IsNotExist(err) {
 		return false
 	}
 

integration/nwo/token/common/utils.go

@@ -42,8 +42,9 @@ type UserAlias = string
 type UserConfig struct {
 	Name     UserAlias `json:"name"     yaml:"name"`
 	Username Username  `json:"username" yaml:"username"`
-	Password string    `json:"password" yaml:"password"` //nolint:gosec
-	Endpoint string    `json:"endpoint" yaml:"endpoint"`
+	//nolint:gosec // this is a test model
+	Password string `json:"password" yaml:"password"`
+	Endpoint string `json:"endpoint" yaml:"endpoint"`
 }
 
 type SuiteConfig struct {

integration/nwo/txgen/model/config.go

@@ -8,7 +8,8 @@ package rest
 
 type LoginRequest struct {
 	Username string `json:"username"`
-	Password string `json:"password"` //nolint:gosec
+	//nolint:gosec // this is a login request struct for tests
+	Password string `json:"password"`
 }
 
 type LoginResponse struct {

integration/nwo/txgen/service/user/rest/intermediary_api.go

@@ -130,7 +130,7 @@ func (o *AuthorizationMultiplexer) Issued(ctx context.Context, issuer token.Iden
 func (o *AuthorizationMultiplexer) OwnerType(raw []byte) (driver.IdentityType, []byte, error) {
 	owner, err := identity.UnmarshalTypedIdentity(raw)
 	if err != nil {
-		return "", nil, err
+		return driver.ZeroIdentityType, nil, err
 	}
 
 	return owner.Type, owner.Identity, nil

token/core/common/authorization.go

@@ -145,7 +145,7 @@ func TestAuthorizationMultiplexer(t *testing.T) {
 	})
 
 	t.Run("OwnerType", func(t *testing.T) {
-		idType := "test-type"
+		idType := identity.Type(99) // test type
 		idRaw := []byte("test-identity")
 		raw, err := identity.WrapWithType(idType, idRaw)
 		require.NoError(t, err)

token/core/common/authorization_test.go

@@ -14,7 +14,6 @@ import (
 
 // Deserializer deserializes verifiers associated with issuers, owners, and auditors
 type Deserializer struct {
-	identityType         string
 	auditorDeserializer  driver.VerifierDeserializer
 	ownerDeserializer    driver.VerifierDeserializer
 	issuerDeserializer   driver.VerifierDeserializer
@@ -24,15 +23,13 @@ type Deserializer struct {
 
 // NewDeserializer returns a new Deserializer for the passed arguments.
 func NewDeserializer(
-	identityType string,
 	auditorDeserializer driver.VerifierDeserializer,
 	ownerDeserializer driver.VerifierDeserializer,
 	issuerDeserializer driver.VerifierDeserializer,
 	auditMatcherProvider driver.AuditMatcherProvider,
 	recipientExtractor driver.RecipientExtractor,
 ) *Deserializer {
 	return &Deserializer{
-		identityType:         identityType,
 		auditorDeserializer:  auditorDeserializer,
 		ownerDeserializer:    ownerDeserializer,
 		issuerDeserializer:   issuerDeserializer,