Commit 0914efab authored by vipwzw's avatar vipwzw

auto ci

parent 5ce7a230
......@@ -273,7 +273,7 @@ func getDappForkHeight(forkKey string) int64 {
} else {
forkHeight = types.GetDappFork(pt.ParaX, forkKey)
if types.IsLocal(){
if types.IsLocal() {
switch forkKey {
case pt.ForkCommitTx:
forkHeight = 10
......@@ -498,12 +498,11 @@ func (a *action) commitTxDone(nodeStatus *pt.ParacrossNodeStatus, stat *pt.Parac
saveTitleHeight(a.db, calcTitleHeightKey(stat.Title, stat.Height), stat)
//之前记录的stat 状态没更新
if stat.MainHeight >= getDappForkHeight(pt.ForkLoopCheckCommitTxDone){
if stat.MainHeight >= getDappForkHeight(pt.ForkLoopCheckCommitTxDone) {
r := makeCommitStatReceipt(stat)
receipt = mergeReceipt(receipt, r)
}
//add commit done receipt
receiptDone := makeDoneReceipt(a.exec.GetMainHeight(), nodeStatus, int32(most), int32(commitCount), int32(len(nodes)))
receipt = mergeReceipt(receipt, receiptDone)
......@@ -555,7 +554,7 @@ func (a *action) procCrossTxs(status *pt.ParacrossNodeStatus) (*types.Receipt, e
}
if enableParacrossTransfer && status.Height > 0 && haveCrossTxs {
clog.Info("paracross.Commit commitDone do cross", "height",status.Height, "havecross",haveCrossTxs)
clog.Info("paracross.Commit commitDone do cross", "height", status.Height, "havecross", haveCrossTxs)
crossTxReceipt, err := a.execCrossTxs(status)
if err != nil {
return nil, err
......
......@@ -32,7 +32,7 @@ func (e *Paracross) ExecDelLocal_Commit(payload *pt.ParacrossCommitAction, tx *t
key = calcLocalHeightKey(g.Title, g.Height)
set.KV = append(set.KV, &types.KeyValue{Key: key, Value: nil})
if !types.IsPara() && g.Height >0{
if !types.IsPara() && g.Height > 0 {
r, err := e.saveLocalParaTxs(tx, true)
if err != nil {
return nil, err
......@@ -88,7 +88,7 @@ func (e *Paracross) ExecDelLocal_NodeConfig(payload *pt.ParaNodeAddrConfig, tx *
key = calcLocalHeightKey(g.Title, g.Height)
set.KV = append(set.KV, &types.KeyValue{Key: key, Value: nil})
if !types.IsPara() && g.Height >0{
if !types.IsPara() && g.Height > 0 {
r, err := e.saveLocalParaTxsFork(&g, true)
if err != nil {
return nil, err
......
......@@ -35,7 +35,7 @@ func (e *Paracross) ExecLocal_Commit(payload *pt.ParacrossCommitAction, tx *type
key = calcLocalHeightKey(g.Title, g.Height)
set.KV = append(set.KV, &types.KeyValue{Key: key, Value: types.Encode(&g)})
if !types.IsPara() && g.Height >0 {
if !types.IsPara() && g.Height > 0 {
r, err := e.saveLocalParaTxs(tx, false)
if err != nil {
return nil, err
......@@ -90,7 +90,7 @@ func (e *Paracross) ExecLocal_NodeConfig(payload *pt.ParaNodeAddrConfig, tx *typ
key = calcLocalHeightKey(g.Title, g.Height)
set.KV = append(set.KV, &types.KeyValue{Key: key, Value: types.Encode(&g)})
if !types.IsPara() && g.Height >0{
if !types.IsPara() && g.Height > 0 {
r, err := e.saveLocalParaTxsFork(&g, false)
if err != nil {
return nil, err
......
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