Commit 8a6d07a6 authored by vipwzw's avatar vipwzw

auto ci

parent 4e3ba138
...@@ -237,7 +237,7 @@ func getMostCommit(stat *pt.ParacrossHeightStatus) (int, string) { ...@@ -237,7 +237,7 @@ func getMostCommit(stat *pt.ParacrossHeightStatus) (int, string) {
} }
//需要在ForkLoopCheckCommitTxDone后使用 //需要在ForkLoopCheckCommitTxDone后使用
func getMostResults(mostHash []byte, stat *pt.ParacrossHeightStatus) ([]byte,[]byte, []byte, []byte, []byte) { func getMostResults(mostHash []byte, stat *pt.ParacrossHeightStatus) ([]byte, []byte, []byte, []byte, []byte) {
for i, hash := range stat.BlockDetails.BlockHashs { for i, hash := range stat.BlockDetails.BlockHashs {
if bytes.Equal(mostHash, hash) { if bytes.Equal(mostHash, hash) {
return stat.BlockDetails.StateHashs[i], stat.BlockDetails.TxResults[i], stat.BlockDetails.TxHashs[i], stat.BlockDetails.CrossTxResults[i], stat.BlockDetails.CrossTxHashs[i] return stat.BlockDetails.StateHashs[i], stat.BlockDetails.TxResults[i], stat.BlockDetails.TxHashs[i], stat.BlockDetails.CrossTxResults[i], stat.BlockDetails.CrossTxHashs[i]
...@@ -317,9 +317,9 @@ func (a *action) getNodesGroup(title string) (map[string]struct{}, error) { ...@@ -317,9 +317,9 @@ func (a *action) getNodesGroup(title string) (map[string]struct{}, error) {
} }
//相同的BlockHash,只保留一份数据 //相同的BlockHash,只保留一份数据
func updateCommitBlockHashs(stat *pt.ParacrossHeightStatus,commit *pt.ParacrossNodeStatus) { func updateCommitBlockHashs(stat *pt.ParacrossHeightStatus, commit *pt.ParacrossNodeStatus) {
for _, blockHash := range stat.BlockDetails.BlockHashs { for _, blockHash := range stat.BlockDetails.BlockHashs {
if bytes.Equal(blockHash,commit.BlockHash) { if bytes.Equal(blockHash, commit.BlockHash) {
return return
} }
} }
...@@ -431,7 +431,7 @@ func (a *action) Commit(commit *pt.ParacrossCommitAction) (*types.Receipt, error ...@@ -431,7 +431,7 @@ func (a *action) Commit(commit *pt.ParacrossCommitAction) (*types.Receipt, error
stat.MainHash = commit.Status.MainBlockHash stat.MainHash = commit.Status.MainBlockHash
} }
if commit.Status.MainBlockHeight >= getDappForkHeight(pt.ForkLoopCheckCommitTxDone) { if commit.Status.MainBlockHeight >= getDappForkHeight(pt.ForkLoopCheckCommitTxDone) {
updateCommitBlockHashs(stat,commit.Status) updateCommitBlockHashs(stat, commit.Status)
} }
receipt = makeCommitReceipt(a.fromaddr, commit, nil, stat) receipt = makeCommitReceipt(a.fromaddr, commit, nil, stat)
...@@ -447,13 +447,13 @@ func (a *action) Commit(commit *pt.ParacrossCommitAction) (*types.Receipt, error ...@@ -447,13 +447,13 @@ func (a *action) Commit(commit *pt.ParacrossCommitAction) (*types.Receipt, error
if found { if found {
stat.Details.BlockHash[index] = commit.Status.BlockHash stat.Details.BlockHash[index] = commit.Status.BlockHash
if commit.Status.MainBlockHeight >= getDappForkHeight(pt.ForkLoopCheckCommitTxDone) { if commit.Status.MainBlockHeight >= getDappForkHeight(pt.ForkLoopCheckCommitTxDone) {
updateCommitBlockHashs(stat,commit.Status) updateCommitBlockHashs(stat, commit.Status)
} }
} else { } else {
stat.Details.Addrs = append(stat.Details.Addrs, a.fromaddr) stat.Details.Addrs = append(stat.Details.Addrs, a.fromaddr)
stat.Details.BlockHash = append(stat.Details.BlockHash, commit.Status.BlockHash) stat.Details.BlockHash = append(stat.Details.BlockHash, commit.Status.BlockHash)
if commit.Status.MainBlockHeight >= getDappForkHeight(pt.ForkLoopCheckCommitTxDone) { if commit.Status.MainBlockHeight >= getDappForkHeight(pt.ForkLoopCheckCommitTxDone) {
updateCommitBlockHashs(stat,commit.Status) updateCommitBlockHashs(stat, commit.Status)
} }
} }
......
This diff is collapsed.
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