@@ -8,10 +8,10 @@ package sig
88
99import (
1010 "context"
11- "reflect"
1211 "runtime/debug"
1312 "sync"
1413
14+ logging2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1515 "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections"
1616 "github.com/hyperledger-labs/fabric-token-sdk/token/driver"
1717 identity2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity"
@@ -66,15 +66,13 @@ func (o *Service) RegisterSigner(identity driver.Identity, signer driver.Signer,
6666 }
6767
6868 idHash := identity .UniqueID ()
69- if logger .IsEnabledFor (zapcore .DebugLevel ) {
70- logger .Debugf ("register signer and verifier [%s]:[%s][%s]" , idHash , GetIdentifier (signer ), GetIdentifier (verifier ))
71- }
69+ logger .Debugf ("register signer and verifier [%s]:[%s][%s]" , idHash , logging2 .Identifier (signer ), logging2 .Identifier (verifier ))
7270 // First check with read lock
7371 o .sync .RLock ()
7472 s , ok := o .signers [idHash ]
7573 o .sync .RUnlock ()
7674 if ok {
77- logger .Warnf ("another signer bound to [%s]:[%s][%s] from [%s]" , identity , GetIdentifier (s ), GetIdentifier (signer ), string (s .DebugStack ))
75+ logger .Warnf ("another signer bound to [%s]:[%s][%s] from [%s]" , identity , logging2 . Identifier (s ), logging2 . Identifier (signer ), string (s .DebugStack ))
7876 return nil
7977 }
8078
@@ -85,7 +83,7 @@ func (o *Service) RegisterSigner(identity driver.Identity, signer driver.Signer,
8583 s , ok = o .signers [idHash ]
8684 if ok {
8785 o .sync .Unlock ()
88- logger .Warnf ("another signer bound to [%s]:[%s][%s] from [%s]" , identity , GetIdentifier (s ), GetIdentifier (signer ), string (s .DebugStack ))
86+ logger .Warnf ("another signer bound to [%s]:[%s][%s] from [%s]" , identity , logging2 . Identifier (s ), logging2 . Identifier (signer ), string (s .DebugStack ))
8987 return nil
9088 }
9189
@@ -112,9 +110,7 @@ func (o *Service) RegisterSigner(identity driver.Identity, signer driver.Signer,
112110 }
113111 }
114112
115- if logger .IsEnabledFor (zapcore .DebugLevel ) {
116- logger .Debugf ("register signer and verifier [%s]:[%s][%s], done" , idHash , GetIdentifier (signer ), GetIdentifier (verifier ))
117- }
113+ logger .Debugf ("register signer and verifier [%s]:[%s][%s], done" , idHash , logging2 .Identifier (signer ), logging2 .Identifier (verifier ))
118114 return nil
119115}
120116
@@ -129,7 +125,7 @@ func (o *Service) RegisterVerifier(identity driver.Identity, verifier driver.Ver
129125 v , ok := o .verifiers [idHash ]
130126 o .sync .RUnlock ()
131127 if ok {
132- logger .Warnf ("another verifier bound to [%s]:[%s][%s] from [%s]" , idHash , GetIdentifier (v ), GetIdentifier (verifier ), string (v .DebugStack ))
128+ logger .Warnf ("another verifier bound to [%s]:[%s][%s] from [%s]" , idHash , logging2 . Identifier (v ), logging2 . Identifier (verifier ), string (v .DebugStack ))
133129 return nil
134130 }
135131
@@ -140,7 +136,7 @@ func (o *Service) RegisterVerifier(identity driver.Identity, verifier driver.Ver
140136 v , ok = o .verifiers [idHash ]
141137 if ok {
142138 o .sync .Unlock ()
143- logger .Warnf ("another verifier bound to [%s]:[%s][%s] from [%s]" , idHash , GetIdentifier (v ), GetIdentifier (verifier ), string (v .DebugStack ))
139+ logger .Warnf ("another verifier bound to [%s]:[%s][%s] from [%s]" , idHash , logging2 . Identifier (v ), logging2 . Identifier (verifier ), string (v .DebugStack ))
144140 return nil
145141 }
146142
@@ -151,9 +147,7 @@ func (o *Service) RegisterVerifier(identity driver.Identity, verifier driver.Ver
151147 o .verifiers [idHash ] = entry
152148 o .sync .Unlock ()
153149
154- if logger .IsEnabledFor (zapcore .DebugLevel ) {
155- logger .Debugf ("register verifier to [%s]:[%s]" , idHash , GetIdentifier (verifier ))
156- }
150+ logger .Debugf ("register verifier to [%s]:[%s]" , idHash , logging2 .Identifier (verifier ))
157151 return nil
158152}
159153
@@ -331,8 +325,8 @@ func (o *Service) GetVerifier(identity driver.Identity) (driver.Verifier, error)
331325 entry = VerifierEntry {Verifier : verifier }
332326 if logger .IsEnabledFor (zapcore .DebugLevel ) {
333327 entry .DebugStack = debug .Stack ()
334- logger .Debugf ("add deserialized verifier for [%s]:[%s]" , idHash , GetIdentifier (verifier ))
335328 }
329+ logger .Debugf ("add deserialized verifier for [%s]:[%s]" , idHash , logging2 .Identifier (verifier ))
336330 o .verifiers [idHash ] = entry
337331 return verifier , nil
338332}
@@ -342,14 +336,3 @@ func (o *Service) deleteSigner(id string) {
342336 defer o .sync .Unlock ()
343337 delete (o .signers , id )
344338}
345-
346- func GetIdentifier (f any ) string {
347- if f == nil {
348- return "<nil>"
349- }
350- t := reflect .TypeOf (f )
351- for t .Kind () == reflect .Ptr {
352- t = t .Elem ()
353- }
354- return t .PkgPath () + "/" + t .Name ()
355- }
0 commit comments