Commit eb1c0eb0 authored by vipwzw's avatar vipwzw

auto ci

parent 04edebce
...@@ -370,13 +370,13 @@ func (client *client) createBlock(lastBlock *types.Block, txs []*types.Transacti ...@@ -370,13 +370,13 @@ func (client *client) createBlock(lastBlock *types.Block, txs []*types.Transacti
return err return err
} }
func (client *client) createBlockTemp(txs []*types.Transaction, mainBlock *types.BlockSeq) error{ func (client *client) createBlockTemp(txs []*types.Transaction, mainBlock *types.BlockSeq) error {
lastBlock, err := client.RequestLastBlock() lastBlock, err := client.RequestLastBlock()
if err != nil { if err != nil {
plog.Error("Parachain RequestLastBlock fail", "err", err) plog.Error("Parachain RequestLastBlock fail", "err", err)
return err return err
} }
return client.createBlock(lastBlock,txs,0,mainBlock) return client.createBlock(lastBlock, txs, 0, mainBlock)
} }
......
...@@ -104,7 +104,7 @@ func (client *commitMsgClient) clearSendingTx() { ...@@ -104,7 +104,7 @@ func (client *commitMsgClient) clearSendingTx() {
} }
func (client *commitMsgClient) procSendTx() { func (client *commitMsgClient) procSendTx() {
plog.Info("para procSendTx ---send", "consensHeight",atomic.LoadInt64(&client.consensHeight), plog.Info("para procSendTx ---send", "consensHeight", atomic.LoadInt64(&client.consensHeight),
"chainHeight", atomic.LoadInt64(&client.chainHeight), "chainHeight", atomic.LoadInt64(&client.chainHeight),
"sendingHeight", client.sendingHeight, "isSendingTx", client.isSendingCommitMsg(), "sync", client.isSync()) "sendingHeight", client.sendingHeight, "isSendingTx", client.isSendingCommitMsg(), "sync", client.isSync())
if client.isSendingCommitMsg() || !client.isSync() { if client.isSendingCommitMsg() || !client.isSync() {
...@@ -144,23 +144,23 @@ func (client *commitMsgClient) procSendTx() { ...@@ -144,23 +144,23 @@ func (client *commitMsgClient) procSendTx() {
func (client *commitMsgClient) isSync() bool { func (client *commitMsgClient) isSync() bool {
height := atomic.LoadInt64(&client.chainHeight) height := atomic.LoadInt64(&client.chainHeight)
if height <= 0 { if height <= 0 {
plog.Info("para isSync", "chainHeight",height) plog.Info("para isSync", "chainHeight", height)
return false return false
} }
height = atomic.LoadInt64(&client.consensHeight) height = atomic.LoadInt64(&client.consensHeight)
if height == -2 { if height == -2 {
plog.Info("para isSync", "consensHeight",height) plog.Info("para isSync", "consensHeight", height)
return false return false
} }
if atomic.LoadInt32(&client.authAccountIn) != 1 { if atomic.LoadInt32(&client.authAccountIn) != 1 {
plog.Info("para isSync ", "authAccountIn",atomic.LoadInt32(&client.authAccountIn)) plog.Info("para isSync ", "authAccountIn", atomic.LoadInt32(&client.authAccountIn))
return false return false
} }
if atomic.LoadInt32(&client.minerSwitch) != 1 { if atomic.LoadInt32(&client.minerSwitch) != 1 {
plog.Info("para isSync ", "minerSwitch",atomic.LoadInt32(&client.minerSwitch)) plog.Info("para isSync ", "minerSwitch", atomic.LoadInt32(&client.minerSwitch))
return false return false
} }
...@@ -572,7 +572,7 @@ out: ...@@ -572,7 +572,7 @@ out:
} else { } else {
atomic.StoreInt32(&client.authAccountIn, 0) atomic.StoreInt32(&client.authAccountIn, 0)
} }
plog.Info("para getConsensusHeight", "height",status.Height,"AccoutIn",authExist) plog.Info("para getConsensusHeight", "height", status.Height, "AccoutIn", authExist)
} }
} }
......
...@@ -108,7 +108,7 @@ func (client *client) createLocalBlock(lastBlock *pt.ParaLocalDbBlock, txs []*ty ...@@ -108,7 +108,7 @@ func (client *client) createLocalBlock(lastBlock *pt.ParaLocalDbBlock, txs []*ty
return err return err
} }
client.checkCommitTxSuccess(mainBlock.Detail) client.checkCommitTxSuccess(mainBlock.Detail)
err = client.createBlockTemp(txs,mainBlock) err = client.createBlockTemp(txs, mainBlock)
return err return 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