Commit d4cffcdd authored by vipwzw's avatar vipwzw

auto ci

parent 0fc2c2e5
...@@ -528,7 +528,6 @@ out: ...@@ -528,7 +528,6 @@ out:
client.paraClient.wg.Done() client.paraClient.wg.Done()
} }
func (client *commitMsgClient) getConsensusStatus(block *types.Block) (*pt.ParacrossStatus, error) { func (client *commitMsgClient) getConsensusStatus(block *types.Block) (*pt.ParacrossStatus, error) {
if isParaSelfConsensusForked(block.MainHeight) { if isParaSelfConsensusForked(block.MainHeight) {
//从本地查询共识高度 //从本地查询共识高度
......
...@@ -32,7 +32,7 @@ func (e *Paracross) ExecDelLocal_Commit(payload *pt.ParacrossCommitAction, tx *t ...@@ -32,7 +32,7 @@ func (e *Paracross) ExecDelLocal_Commit(payload *pt.ParacrossCommitAction, tx *t
key = calcLocalHeightKey(g.Title, g.Height) key = calcLocalHeightKey(g.Title, g.Height)
set.KV = append(set.KV, &types.KeyValue{Key: key, Value: nil}) set.KV = append(set.KV, &types.KeyValue{Key: key, Value: nil})
if !types.IsPara(){ if !types.IsPara() {
r, err := e.saveLocalParaTxs(tx, true) r, err := e.saveLocalParaTxs(tx, true)
if err != nil { if err != nil {
return nil, err return nil, err
......
...@@ -31,7 +31,7 @@ func (e *Paracross) ExecLocal_Commit(payload *pt.ParacrossCommitAction, tx *type ...@@ -31,7 +31,7 @@ func (e *Paracross) ExecLocal_Commit(payload *pt.ParacrossCommitAction, tx *type
key = calcLocalHeightKey(g.Title, g.Height) key = calcLocalHeightKey(g.Title, g.Height)
set.KV = append(set.KV, &types.KeyValue{Key: key, Value: types.Encode(&g)}) set.KV = append(set.KV, &types.KeyValue{Key: key, Value: types.Encode(&g)})
if !types.IsPara(){ if !types.IsPara() {
r, err := e.saveLocalParaTxs(tx, false) r, err := e.saveLocalParaTxs(tx, false)
if err != nil { if err != nil {
return nil, err 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