some cleanup

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

# Conflicts:
#	token/services/identity/role/wallets.go

Author: adecaro

token/services/identity/role/wallets.go

@@ -488,9 +488,11 @@ func (w *AnonymousOwnerWallet) RegisterRecipient(ctx context.Context, data *driv
 	if err != nil {
 		return errors.Wrapf(err, "failed to match identity to audit infor for [%s]:[%s]", data.Identity, utils.Hashable(data.AuditInfo))
 	}
+	// register recipient data
 	if err := w.IdentityProvider.RegisterRecipientData(ctx, data); err != nil {
 		return errors.Wrapf(err, "failed registering audit info for owner [%s]", data.Identity)
 	}
+	// bind to enrollment id and wallet id
 	if err := w.WalletRegistry.BindIdentity(ctx, data.Identity, w.EnrollmentID(), w.WalletID, nil); err != nil {
 		return errors.WithMessagef(err, "failed storing recipient identity in wallet [%s]", w.WalletID)
 	}

token/services/identity/role/wallets_test.go

@@ -297,7 +297,6 @@ func TestAnonymousOwnerWallet(t *testing.T) {
 		// Case 1: Success
 		// Deserialize OwnerVerifier defaults to nil, error nil => success verification
 		des.MatchIdentityReturns(nil)
-		ip.RegisterVerifierReturns(nil)
 		ip.RegisterRecipientDataReturns(nil)
 		reg.BindIdentityReturns(nil)
 
@@ -311,11 +310,11 @@ func TestAnonymousOwnerWallet(t *testing.T) {
 		assert.Contains(t, err.Error(), "failed to match identity")
 		des.MatchIdentityReturns(nil)
 
-		// Case 3: RegisterVerifier failure
-		ip.RegisterVerifierReturns(errors.New("reg verifier error"))
+		// Case 3: RegisterRecipientData failure
+		ip.RegisterRecipientDataReturns(errors.New("reg recipient data error"))
 		err = w.RegisterRecipient(t.Context(), data)
 		require.Error(t, err)
-		ip.RegisterVerifierReturns(nil)
+		ip.RegisterRecipientDataReturns(nil)
 
 		// Case 4: BindIdentity failure
 		reg.BindIdentityReturns(errors.New("bind error"))