test fix with replicas

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

Author: adecaro

integration/token/fungible/support.go

@@ -1129,7 +1129,7 @@ func RegisterOwnerIdentity(network *integration.Infrastructure, id *token3.NodeR
 		_, err := network.Client(replicaName).CallView("RegisterOwnerIdentity", common.JSONMarshall(&views.RegisterOwnerIdentity{
 			IdentityConfiguration: identityConfiguration,
 		}))
-		Expect(err).NotTo(HaveOccurred())
+		Expect(err).NotTo(HaveOccurred(), "cannot register owner identity at replica [%s]", replicaName)
 		network.Ctx.SetViewClient(identityConfiguration.ID, network.Client(replicaName))
 	}
 }

token/services/db/sql/common/identity.go

@@ -97,7 +97,7 @@ func (db *IdentityDB) AddConfiguration(wp driver.IdentityConfiguration) error {
 	if err != nil {
 		return errors.Wrapf(err, "failed compiling query")
 	}
-	logger.Debug(query)
+	logger.Debug(query, wp.ID, wp.Type, wp.URL, wp.Config, wp.Raw)
 
 	_, err = db.db.Exec(query, wp.ID, wp.Type, wp.URL, wp.Config, wp.Raw)
 	return err

token/services/identity/common/lm.go

@@ -312,7 +312,7 @@ func (l *LocalMembership) registerLocalIdentity(identityConfig *driver.IdentityC
 		return errors.Wrapf(err, "failed to add local identity for [%s]", identityConfig.ID)
 	}
 
-	if exists, _ := l.identityDB.ConfigurationExists(identityConfig.ID, identityConfig.Type, identityConfig.URL); !exists {
+	if exists, _ := l.identityDB.ConfigurationExists(identityConfig.ID, l.IdentityType, identityConfig.URL); !exists {
 		l.logger.Debugf("does the configuration already exists for [%s]? no, add it", identityConfig.ID)
 		if err := l.identityDB.AddConfiguration(driver3.IdentityConfiguration{
 			ID:     identityConfig.ID,
@@ -348,6 +348,7 @@ func (l *LocalMembership) registerLocalIdentities(configuration *driver.Identity
 		return nil
 	}
 	found := 0
+	var errs []error
 	for _, entry := range entries {
 		if !entry.IsDir() {
 			continue
@@ -358,13 +359,14 @@ func (l *LocalMembership) registerLocalIdentities(configuration *driver.Identity
 			URL:    filepath.Join(configuration.URL, id),
 			Config: configuration.Config,
 		}, false); err != nil {
+			errs = append(errs, err)
 			l.logger.Errorf("failed registering local identity [%s]: [%s]", id, err)
 			continue
 		}
 		found++
 	}
 	if found == 0 {
-		return errors.Errorf("no valid identities found in [%s]", configuration.URL)
+		return errors.Errorf("no valid identities found in [%s], errs [%v]", configuration.URL, errs)
 	}
 	return nil
 }

token/services/identity/msp/idemix/kmp.go

@@ -44,11 +44,11 @@ func (l *KeyManagerProvider) Get(identityConfig *driver.IdentityConfiguration) (
 	var err error
 	if len(identityConfig.Raw) != 0 {
 		// load the msp config directly from identityConfig.Raw
-		logger.Infof("load the msp config directly from identityConfig.Raw [%s]", hash.Hashable(identityConfig.Raw))
+		logger.Infof("load the msp config directly from identityConfig.Raw [%s][%s]", identityConfig.ID, hash.Hashable(identityConfig.Raw))
 		conf, err = msp2.NewMSPConfigFromRawSigner(l.issuerPublicKey, identityConfig.Raw, l.mspID)
 	} else {
 		// load from URL
-		logger.Infof("load the msp config form identityConfig.URL [%s]", identityConfig.URL)
+		logger.Infof("load the msp config form identityConfig.URL [%s][%s]", identityConfig.ID, identityConfig.URL)
 		conf, err = msp2.NewMSPConfigFromURL(l.issuerPublicKey, identityConfig.URL, l.mspID, l.ignoreVerifyOnlyWallet)
 	}
 	if err != nil {