luxfi/sdk
1
0
Fork 0
mirror of https://github.com/luxfi/sdk.git synced 2026-07-27 06:07:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve bft.Logger interface and staticcheck warnings

Browse Source 
- Update loggerAdapter to properly convert log.Field to logger context
- Simplify KeychainAdapter methods by removing redundant type assertions
This commit is contained in:
Zach Kelling
2026-02-05 17:06:57 -08:00
parent c311379552
commit 99fea1a85f
4 changed files with 21 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bft_engine.go
+16 -35
View File
@@ -390,60 +390,41 @@ type loggerAdapter struct {
logger log.Logger
}
func (l *loggerAdapter) Fatal(msg string, fields ...log.Field) {
ctx := make([]interface{}, len(fields))
for i, f := range fields {
ctx[i] = f
// logFieldsToCtx converts log.Field slice to interface{} slice for the logger
func logFieldsToCtx(fields []log.Field) []interface{} {
ctx := make([]interface{}, 0, len(fields)*2)
for _, f := range fields {
ctx = append(ctx, f.Key, f.Value)
}
l.logger.Fatal(msg, ctx...)
return ctx
}
func (l *loggerAdapter) Fatal(msg string, fields ...log.Field) {
l.logger.Fatal(msg, logFieldsToCtx(fields)...)
}
func (l *loggerAdapter) Error(msg string, fields ...log.Field) {
ctx := make([]interface{}, len(fields))
for i, f := range fields {
ctx[i] = f
}
l.logger.Error(msg, ctx...)
l.logger.Error(msg, logFieldsToCtx(fields)...)
}
func (l *loggerAdapter) Warn(msg string, fields ...log.Field) {
ctx := make([]interface{}, len(fields))
for i, f := range fields {
ctx[i] = f
}
l.logger.Warn(msg, ctx...)
l.logger.Warn(msg, logFieldsToCtx(fields)...)
}
func (l *loggerAdapter) Info(msg string, fields ...log.Field) {
ctx := make([]interface{}, len(fields))
for i, f := range fields {
ctx[i] = f
}
l.logger.Info(msg, ctx...)
l.logger.Info(msg, logFieldsToCtx(fields)...)
}
func (l *loggerAdapter) Trace(msg string, fields ...log.Field) {
ctx := make([]interface{}, len(fields))
for i, f := range fields {
ctx[i] = f
}
l.logger.Trace(msg, ctx...)
l.logger.Trace(msg, logFieldsToCtx(fields)...)
}
func (l *loggerAdapter) Debug(msg string, fields ...log.Field) {
ctx := make([]interface{}, len(fields))
for i, f := range fields {
ctx[i] = f
}
l.logger.Debug(msg, ctx...)
l.logger.Debug(msg, logFieldsToCtx(fields)...)
}
func (l *loggerAdapter) Verbo(msg string, fields ...log.Field) {
ctx := make([]interface{}, len(fields))
for i, f := range fields {
ctx[i] = f
}
l.logger.Verbo(msg, ctx...)
l.logger.Verbo(msg, logFieldsToCtx(fields)...)
}
// nodeIDToBFT converts ids.NodeID to bft.NodeID
go.mod
+1 -1
View File
@@ -39,7 +39,7 @@ require (
github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213
github.com/luxfi/address v1.0.1
github.com/luxfi/api v1.0.1
github.com/luxfi/bft v0.1.0
github.com/luxfi/bft v0.1.5
github.com/luxfi/consensus v1.22.63
github.com/luxfi/constants v1.4.4
github.com/luxfi/database v1.17.40
go.sum
+2 -2
View File
@@ -294,8 +294,8 @@ github.com/luxfi/api v1.0.1 h1:xPxqmEMyAJ15sneyeiTHU87p5UYs8GOhQpKB/a9TUk8=
github.com/luxfi/api v1.0.1/go.mod h1:N2Ymyqo3SoB6/DmPXRV6W377k2qNqZujSP/B8fbIB9U=
github.com/luxfi/atomic v1.0.0 h1:xUV60MuzRvXngaQ1sM0yVC2v4TRoLlUGkkH7M9PS4yw=
github.com/luxfi/atomic v1.0.0/go.mod h1:0G2mTlQ6TXWHICUHrUUPu1/qAiIyR4gSZ2tva9ci/bI=
github.com/luxfi/bft v0.1.0 h1:7PuGqoDSFTVwxT3MF0VU+c/QeC/HVerKJtpNL+4Bp0M=
github.com/luxfi/bft v0.1.0/go.mod h1:IUT167Erk2h8z36197Yrmu/3CBIsZku5WlEG8O2NMp4=
github.com/luxfi/bft v0.1.5 h1:5xVLPkog4e5LTgaVlb9pgxA0EWE6tkrKwHPZVRz+RZw=
github.com/luxfi/bft v0.1.5/go.mod h1:5I8Ft8yA69xZlDe3RB0i4MgbqFKLZe65o/sha8JuKvU=
github.com/luxfi/cache v1.2.1 h1:kAzOS55/hmYeNKR+0HAKv4ma48Y6JjkI8UQeqdZ8bfI=
github.com/luxfi/cache v1.2.1/go.mod h1:co7JTxZZHpKT31Yh01LFp5aZOxmoUg157FhBLQdQHVU=
github.com/luxfi/codec v1.1.4 h1:Yl8ZalMNkqo7cD6R9AjczAajkLOmsjyZ9+DASVYHrvg=
wallet/primary/wallet.go
+2 -12
View File
@@ -40,22 +40,12 @@ func (kc *KeychainAdapter) Addresses() set.Set[ids.ShortID] {
// Get implements wallet/keychain.Keychain (returns wallet/keychain.Signer, not utils/crypto/keychain.Signer)
func (kc *KeychainAdapter) Get(addr ids.ShortID) (keychain.Signer, bool) {
signer, ok := kc.Keychain.Get(addr)
if !ok {
return nil, false
}
// secp256k1fx.luxSigner already implements wallet/keychain.Signer
return signer.(keychain.Signer), true
return kc.Keychain.Get(addr)
}
// GetEth implements c.EthKeychain
func (kc *KeychainAdapter) GetEth(addr gethcommon.Address) (keychain.Signer, bool) {
signer, ok := kc.Keychain.GetEth(addr)
if !ok {
return nil, false
}
// secp256k1fx.luxSigner already implements wallet/keychain.Signer
return signer.(keychain.Signer), true
return kc.Keychain.GetEth(addr)
}
// EthAddresses implements c.EthKeychain