Commit 0c345a62 authored by liuyuhang's avatar liuyuhang Committed by vipwzw

modify linter

parent 51335caa
......@@ -117,9 +117,9 @@ type RoundState struct {
// RoundStateMessage ...
func (rs *RoundState) RoundStateMessage() *tmtypes.NewRoundStepMsg {
return &tmtypes.NewRoundStepMsg{
Height: rs.Height,
Round: int32(rs.Round),
Step: int32(rs.Step),
Height: rs.Height,
Round: int32(rs.Round),
Step: int32(rs.Step),
SecondsSinceStartTime: int32(time.Since(rs.StartTime).Seconds()),
LastCommitRound: int32(rs.LastCommit.Round()),
}
......
......@@ -73,9 +73,9 @@ func ParseX509CertificateToSm2(x509Cert *x509.Certificate) *sm2.Certificate {
UnknownExtKeyUsage: x509Cert.UnknownExtKeyUsage,
BasicConstraintsValid: x509Cert.BasicConstraintsValid,
IsCA: x509Cert.IsCA,
MaxPathLen: x509Cert.MaxPathLen,
MaxPathLenZero: x509Cert.MaxPathLenZero,
IsCA: x509Cert.IsCA,
MaxPathLen: x509Cert.MaxPathLen,
MaxPathLenZero: x509Cert.MaxPathLenZero,
SubjectKeyId: x509Cert.SubjectKeyId,
AuthorityKeyId: x509Cert.AuthorityKeyId,
......@@ -136,9 +136,9 @@ func ParseSm2CertificateToX509(sm2Cert *sm2.Certificate) *x509.Certificate {
UnknownExtKeyUsage: sm2Cert.UnknownExtKeyUsage,
BasicConstraintsValid: sm2Cert.BasicConstraintsValid,
IsCA: sm2Cert.IsCA,
MaxPathLen: sm2Cert.MaxPathLen,
MaxPathLenZero: sm2Cert.MaxPathLenZero,
IsCA: sm2Cert.IsCA,
MaxPathLen: sm2Cert.MaxPathLen,
MaxPathLenZero: sm2Cert.MaxPathLenZero,
SubjectKeyId: sm2Cert.SubjectKeyId,
AuthorityKeyId: sm2Cert.AuthorityKeyId,
......
......@@ -129,7 +129,7 @@ func New(cfg *types.Store, sub []byte) queue.Module {
isDelMavlData = true
}
// 查询是Upgrade是否需保存mavl
isUpgradeCommitMavl = isCommitMavl(bs.GetDB())
isUpgradeCommitMavl = isCommitMavlDB(bs.GetDB())
bs.SetChild(kvms)
return kvms
......@@ -270,7 +270,7 @@ func (kvmMavls *KVmMavlStore) MemSetUpgrade(datas *types.StoreSet, sync bool) ([
var err error
if isUpgradeCommitMavl {
hash, err := kvmMavls.MavlStore.MemSet(datas, sync)
hash, err = kvmMavls.MavlStore.MemSet(datas, sync)
if err != nil {
return hash, err
}
......@@ -381,7 +381,7 @@ func setDelMavl(state int32) {
atomic.StoreInt32(&delMavlDataState, state)
}
func isCommitMavl(db dbm.DB) bool {
func isCommitMavlDB(db dbm.DB) bool {
prefix := []byte(leafNodePrefix)
it := db.Iterator(prefix, nil, true)
defer it.Close()
......
......@@ -720,12 +720,12 @@ func TestIsCommitMavl(t *testing.T) {
store := New(storeCfg, nil).(*KVmMavlStore)
assert.NotNil(t, store)
isComm := isCommitMavl(store.GetDB())
isComm := isCommitMavlDB(store.GetDB())
require.Equal(t, false, isComm)
store.GetDB().Set([]byte(fmt.Sprintln(leafNodePrefix, "123")), []byte("v1"))
store.GetDB().Set([]byte(fmt.Sprintln(leafNodePrefix, "456")), []byte("v2"))
isComm = isCommitMavl(store.GetDB())
isComm = isCommitMavlDB(store.GetDB())
require.Equal(t, true, isComm)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment