From 7680cdda04bf877fe9ca5ad4783bd0621836080b Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 23 Oct 2023 16:06:46 +0800 Subject: [PATCH] fix shadow var --- types/chain_id.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/types/chain_id.go b/types/chain_id.go index 6841f764b8c2..9351df4b477a 100644 --- a/types/chain_id.go +++ b/types/chain_id.go @@ -15,13 +15,13 @@ const ChainIDFieldName = "chain_id" func ParseChainIDFromGenesis(reader io.Reader) (string, error) { decoder := jstream.NewDecoder(reader, 1).EmitKV() var ( - chain_id string - ok bool + chain_id string + chain_id_ok bool ) err := decoder.Decode(func(mv *jstream.MetaValue) bool { if kv, ok := mv.Value.(jstream.KV); ok { if kv.Key == ChainIDFieldName { - chain_id, ok = kv.Value.(string) + chain_id, chain_id_ok = kv.Value.(string) return false } } @@ -30,7 +30,7 @@ func ParseChainIDFromGenesis(reader io.Reader) (string, error) { if len(chain_id) > 0 { return chain_id, nil } - if !ok { + if !chain_id_ok { return "", errors.New("chain-id is not a string") } if err == nil {