[R4R] - {develop}: fix consensys audit issue: cs-6.37 (#1207)

fix Msgf directives Co-authored-by: Raymond <[email protected]>
mantlenetworkio · Jul 2, 2023 · 630afaa · 630afaa
1 parent 548f9b2
commit 630afaa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/tss/node/tsslib/storage/secrets_mgr.go b/tss/node/tsslib/storage/secrets_mgr.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"time"
+
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
 	bkeygen "github.com/binance-chain/tss-lib/ecdsa/keygen"
 	"github.com/rs/zerolog/log"
-	"time"
 )
 
 const CtxTimeout = 30 * time.Second
@@ -42,12 +43,12 @@ func NewSecretsMgr(secretId string) (*SecretsMgr, error) {
 	result, err := client.GetSecretValue(ctx, params)
 	if err != nil {
 
-		log.Error().Err(err).Msgf("fail to get secret value form aws secrets manager :%w", err)
+		log.Error().Err(err).Msgf("fail to get secret value form aws secrets manager :%v", err)
 		return nil, err
 	}
 	var keys map[string]KeygenLocalState
 	if err := json.Unmarshal(result.SecretBinary, &keys); err != nil {
-		log.Error().Err(err).Msgf("fail to unmarshal data to map :%w", err)
+		log.Error().Err(err).Msgf("fail to unmarshal data to map :%v", err)
 		keys = map[string]KeygenLocalState{}
 	}
 
@@ -74,7 +75,7 @@ func (sm *SecretsMgr) Save() error {
 	}
 	buf, err := json.Marshal(sm.keys)
 	if err != nil {
-		log.Error().Err(err).Msgf("fail to marshal secrets keys map to json: %w", err)
+		log.Error().Err(err).Msgf("fail to marshal secrets keys map to json: %v", err)
 		return err
 	}
 	params := &secretsmanager.UpdateSecretInput{
@@ -83,7 +84,7 @@ func (sm *SecretsMgr) Save() error {
 	}
 	output, err := sm.client.UpdateSecret(context.TODO(), params)
 	if err != nil {
-		log.Error().Err(err).Msgf("fail to put data to aws's secrets manager : %w", err)
+		log.Error().Err(err).Msgf("fail to put data to aws's secrets manager : %v", err)
 		return err
 	}
 	log.Info().Msgf("put data to aws's secrets manager success, version is:%s", output.VersionId)

diff --git a/tss/node/tsslib/storage/shamir_mgr.go b/tss/node/tsslib/storage/shamir_mgr.go
@@ -82,7 +82,7 @@ func (sh *ShamirMgr) GetKeyFile(pubKey, localPartyKey string) (KeygenLocalState,
 		}
 		var keygenlocalstate KeygenLocalState
 		if err := json.Unmarshal([]byte(keygen), &keygenlocalstate); err != nil {
-			log.Error().Err(err).Msgf("fail to unmarshal data to map :%w", err)
+			log.Error().Err(err).Msgf("fail to unmarshal data to map :%v", err)
 			return KeygenLocalState{}, err
 		}
 		//缓存在内存中

diff --git a/tss/node/tsslib/tss.go b/tss/node/tsslib/tss.go
@@ -76,13 +76,13 @@ func NewTss(
 	if shamirConfig.Enable {
 		shamirManager, err = storage2.NewShamirMgr(shamirConfig)
 		if err != nil {
-			log.Error().Err(err).Msgf("fail to create shamir manager :%w", err)
+			log.Error().Err(err).Msgf("fail to create shamir manager :%v", err)
 			return nil, errors.New("fail to create shamir manager")
 		}
 	} else if secretsEnable {
 		secretsManager, err = storage2.NewSecretsMgr(secretId)
 		if err != nil {
-			log.Error().Err(err).Msgf("fail to create secrets manager :%w", err)
+			log.Error().Err(err).Msgf("fail to create secrets manager :%v", err)
 			return nil, errors.New("fail to create secrets manager")
 		}
 	}