Skip to content

P
plugin
Commit 1487c11a authored by liuyuhang's avatar liuyuhang Committed by 33cn
Browse files
Options

mod linter

parent 7b9112bf
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 52 deletions
plugin/consensus/tendermint/types/round_state.go
View file @ 1487c11a
......@@ -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()),
}
......
plugin/dapp/autonomy/executor/board.go
View file @ 1487c11a
......@@ -16,7 +16,7 @@ func (a *Autonomy) execAutoLocalBoard(tx *types.Transaction, receiptData *types.
return set, err
}
dbSet := &types.LocalDBSet{}
dbSet.KV = a.AddRollbackKV(tx, []byte(tx.Execer), set.KV)
dbSet.KV = a.AddRollbackKV(tx, tx.Execer, set.KV)
return dbSet, nil
}
......@@ -54,7 +54,7 @@ func (a *Autonomy) execLocalBoard(receiptData *types.ReceiptData) (*types.LocalD
}
func (a *Autonomy) execAutoDelLocal(tx *types.Transaction, receiptData *types.ReceiptData) (*types.LocalDBSet, error) {
kvs, err := a.DelRollbackKV(tx, []byte(tx.Execer))
kvs, err := a.DelRollbackKV(tx, tx.Execer)
if err != nil {
return nil, err
}
......
plugin/dapp/autonomy/executor/board_test.go
View file @ 1487c11a
......@@ -47,16 +47,18 @@ func testexecLocalBoard(t *testing.T, auto bool) {
var set *types.LocalDBSet
var err error
if auto == false {
if !auto {
set, err = au.execLocalBoard(receipt)
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
set, err = au.execAutoLocalBoard(tx, receipt)
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
//save to database
saveKvs(sdb, set.KV)
......@@ -70,12 +72,14 @@ func testexecLocalBoard(t *testing.T, auto bool) {
Prev: pre1,
Current: cur,
}
if auto == false {
if !auto {
set, err = au.execLocalBoard(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogRvkPropBoard, Log: types.Encode(receiptBoard1)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
......@@ -85,11 +89,10 @@ func testexecLocalBoard(t *testing.T, auto bool) {
{Ty: auty.TyLogRvkPropBoard, Log: types.Encode(receiptBoard1)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
//save to database
saveKvs(sdb, set.KV)
......@@ -105,12 +108,14 @@ func testexecLocalBoard(t *testing.T, auto bool) {
Prev: pre2,
Current: cur,
}
if auto == false {
if !auto {
set, err = au.execLocalBoard(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogVotePropBoard, Log: types.Encode(receiptBoard2)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
......@@ -120,10 +125,10 @@ func testexecLocalBoard(t *testing.T, auto bool) {
{Ty: auty.TyLogVotePropBoard, Log: types.Encode(receiptBoard2)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
//save to database
saveKvs(sdb, set.KV)
// check
......@@ -162,7 +167,7 @@ func testexecDelLocalBoard(t *testing.T, auto bool) {
var set *types.LocalDBSet
var err error
// 先执行local然后进行删除
if auto == false {
if !auto {
set, err := au.execLocalBoard(receipt)
require.NoError(t, err)
require.NotNil(t, set)
......@@ -210,7 +215,7 @@ func testexecDelLocalBoard(t *testing.T, auto bool) {
{Ty: auty.TyLogVotePropBoard, Log: types.Encode(receiptBoard2)},
}}
// 先执行local然后进行删除
if auto == false {
if !auto {
set, err = au.execLocalBoard(recpt)
require.NoError(t, err)
......
plugin/dapp/autonomy/executor/project.go
View file @ 1487c11a
......@@ -16,7 +16,7 @@ func (a *Autonomy) execAutoLocalProject(tx *types.Transaction, receiptData *type
return set, err
}
dbSet := &types.LocalDBSet{}
dbSet.KV = a.AddRollbackKV(tx, []byte(tx.Execer), set.KV)
dbSet.KV = a.AddRollbackKV(tx, tx.Execer, set.KV)
return dbSet, nil
}
......
plugin/dapp/autonomy/executor/project_test.go
View file @ 1487c11a
......@@ -49,16 +49,18 @@ func testexecLocalProject(t *testing.T, auto bool) {
var set *types.LocalDBSet
var err error
if auto == false {
if !auto {
set, err = au.execLocalProject(receipt)
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
set, err = au.execAutoLocalProject(tx, receipt)
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
//save to database
saveKvs(sdb, set.KV)
......@@ -73,12 +75,14 @@ func testexecLocalProject(t *testing.T, auto bool) {
Current: cur,
}
if auto == false {
if !auto {
set, err = au.execLocalProject(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogRvkPropProject, Log: types.Encode(receiptProject1)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
......@@ -88,9 +92,9 @@ func testexecLocalProject(t *testing.T, auto bool) {
{Ty: auty.TyLogRvkPropProject, Log: types.Encode(receiptProject1)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
//save to database
saveKvs(sdb, set.KV)
......@@ -108,12 +112,14 @@ func testexecLocalProject(t *testing.T, auto bool) {
Current: cur,
}
if auto == false {
if !auto {
set, err = au.execLocalProject(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogVotePropProject, Log: types.Encode(receiptProject2)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
......@@ -123,9 +129,9 @@ func testexecLocalProject(t *testing.T, auto bool) {
{Ty: auty.TyLogVotePropProject, Log: types.Encode(receiptProject2)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
//save to database
saveKvs(sdb, set.KV)
......@@ -168,7 +174,7 @@ func testexecDelLocalProject(t *testing.T, auto bool) {
var set *types.LocalDBSet
var err error
// 先执行local然后进行删除
if auto == false {
if !auto {
set, err := au.execLocalProject(receipt)
require.NoError(t, err)
require.NotNil(t, set)
......@@ -216,7 +222,7 @@ func testexecDelLocalProject(t *testing.T, auto bool) {
{Ty: auty.TyLogVotePropProject, Log: types.Encode(receiptProject2)},
}}
// 先执行local然后进行删除
if auto == false {
if !auto {
set, err = au.execLocalProject(recpt)
require.NoError(t, err)
......
plugin/dapp/autonomy/executor/rule.go
View file @ 1487c11a
......@@ -16,7 +16,7 @@ func (a *Autonomy) execAutoLocalRule(tx *types.Transaction, receiptData *types.R
return set, err
}
dbSet := &types.LocalDBSet{}
dbSet.KV = a.AddRollbackKV(tx, []byte(tx.Execer), set.KV)
dbSet.KV = a.AddRollbackKV(tx, tx.Execer, set.KV)
return dbSet, nil
}
......@@ -169,7 +169,7 @@ func (a *Autonomy) execAutoLocalCommentProp(tx *types.Transaction, receiptData *
return set, err
}
dbSet := &types.LocalDBSet{}
dbSet.KV = a.AddRollbackKV(tx, []byte(tx.Execer), set.KV)
dbSet.KV = a.AddRollbackKV(tx, tx.Execer, set.KV)
return dbSet, nil
}
......
plugin/dapp/autonomy/executor/rule_test.go
View file @ 1487c11a
......@@ -47,16 +47,18 @@ func testexecLocalRule(t *testing.T, auto bool) {
var set *types.LocalDBSet
var err error
if auto == false {
if !auto {
set, err = au.execLocalRule(receipt)
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
set, err = au.execAutoLocalRule(tx, receipt)
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
//save to database
saveKvs(sdb, set.KV)
......@@ -70,12 +72,14 @@ func testexecLocalRule(t *testing.T, auto bool) {
Prev: pre1,
Current: cur,
}
if auto == false {
if !auto {
set, err = au.execLocalRule(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogRvkPropRule, Log: types.Encode(receiptRule1)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
......@@ -85,10 +89,10 @@ func testexecLocalRule(t *testing.T, auto bool) {
{Ty: auty.TyLogRvkPropRule, Log: types.Encode(receiptRule1)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
//save to database
saveKvs(sdb, set.KV)
......@@ -104,12 +108,14 @@ func testexecLocalRule(t *testing.T, auto bool) {
Prev: pre2,
Current: cur,
}
if auto == false {
if !auto {
set, err = au.execLocalRule(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogVotePropRule, Log: types.Encode(receiptRule2)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
......@@ -119,10 +125,10 @@ func testexecLocalRule(t *testing.T, auto bool) {
{Ty: auty.TyLogVotePropRule, Log: types.Encode(receiptRule2)},
},
})
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
//save to database
saveKvs(sdb, set.KV)
// check
......@@ -160,7 +166,7 @@ func testexecDelLocalRule(t *testing.T, auto bool) {
var set *types.LocalDBSet
var err error
// 先执行local然后进行删除
if auto == false {
if !auto {
set, err := au.execLocalRule(receipt)
require.NoError(t, err)
require.NotNil(t, set)
......@@ -209,7 +215,7 @@ func testexecDelLocalRule(t *testing.T, auto bool) {
{Ty: auty.TyLogVotePropRule, Log: types.Encode(receiptRule2)},
}}
// 先执行local然后进行删除
if auto == false {
if !auto {
set, err = au.execLocalRule(recpt)
require.NoError(t, err)
......@@ -438,16 +444,18 @@ func testexecLocalCommentProp(t *testing.T, auto bool) {
}
var set *types.LocalDBSet
var err error
if auto == false {
if !auto {
set, err = au.execLocalCommentProp(receipt)
require.NoError(t, err)
require.NotNil(t, set)
} else {
tx, err := types.CreateFormatTx(types.ExecName(auty.AutonomyX), nil)
assert.NoError(t, err)
set, err = au.execAutoLocalCommentProp(tx, receipt)
require.NoError(t, err)
require.NotNil(t, set)
}
require.NoError(t, err)
require.NotNil(t, set)
require.Equal(t, set.KV[0].Key, calcCommentHeight(propID,
dapp.HeightIndexStr(receiptCmt.Height, int64(receiptCmt.Index))))
require.NotNil(t, set.KV[0].Value)
......@@ -482,7 +490,7 @@ func testexecDelLocalCommentProp(t *testing.T, auto bool) {
var set *types.LocalDBSet
var err error
// 先执行local然后进行删除
if auto == false {
if !auto {
set, err = au.execLocalCommentProp(receipt)
require.NoError(t, err)
require.NotNil(t, set)
......
plugin/dapp/cert/authority/tools/cryptogen/generator/utils/certutils.go
View file @ 1487c11a
......@@ -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,
......
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