Commit fd50c684 authored by vipwzw's avatar vipwzw

auto ci

parent 09bd7466
...@@ -120,7 +120,7 @@ func (client *commitMsgClient) procSendTx() { ...@@ -120,7 +120,7 @@ func (client *commitMsgClient) procSendTx() {
//1.如果是在主链共识场景,共识高度可能大于平行链的链高度 //1.如果是在主链共识场景,共识高度可能大于平行链的链高度
//2.已发送,未共识场景 //2.已发送,未共识场景
if chainHeight < consensHeight || client.sendingHeight > consensHeight{ if chainHeight < consensHeight || client.sendingHeight > consensHeight {
return return
} }
...@@ -508,7 +508,7 @@ func (client *commitMsgClient) checkConsensusStop(consensStopTimes uint32) uint3 ...@@ -508,7 +508,7 @@ func (client *commitMsgClient) checkConsensusStop(consensStopTimes uint32) uint3
client.clearSendingTx() client.clearSendingTx()
return 0 return 0
} }
return consensStopTimes+1 return consensStopTimes + 1
} }
return 0 return 0
......
...@@ -75,7 +75,7 @@ func (client *client) addLocalBlock(height int64, block *pt.ParaLocalDbBlock) er ...@@ -75,7 +75,7 @@ func (client *client) addLocalBlock(height int64, block *pt.ParaLocalDbBlock) er
} }
func (client *client) checkCommitTxSuccess(detail *types.BlockDetail) { func (client *client) checkCommitTxSuccess(detail *types.BlockDetail) {
if !client.isCaughtUp || !client.commitMsgClient.isSendingCommitMsg(){ if !client.isCaughtUp || !client.commitMsgClient.isSendingCommitMsg() {
return return
} }
......
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