Commit 33abf21a authored by vipwzw's avatar vipwzw

auto ci

parent 895a68b2
...@@ -313,7 +313,7 @@ func (a *action) superManagerVoteProc(title string) error { ...@@ -313,7 +313,7 @@ func (a *action) superManagerVoteProc(title string) error {
confStopBlocks := conf.GInt("paraConsensusStopBlocks") confStopBlocks := conf.GInt("paraConsensusStopBlocks")
data, err := a.exec.paracrossGetHeight(title) data, err := a.exec.paracrossGetHeight(title)
if err != nil { if err != nil {
clog.Info("paracross.superManagerVoteProc get consens height", "title",title,"err", err.Error()) clog.Info("paracross.superManagerVoteProc get consens height", "title", title, "err", err.Error())
return err return err
} }
var consensMainHeight int64 var consensMainHeight int64
...@@ -324,7 +324,7 @@ func (a *action) superManagerVoteProc(title string) error { ...@@ -324,7 +324,7 @@ func (a *action) superManagerVoteProc(title string) error {
} else { } else {
stat, err := a.exec.paracrossGetStateTitleHeight(title, consensHeight) stat, err := a.exec.paracrossGetStateTitleHeight(title, consensHeight)
if err != nil { if err != nil {
clog.Info("paracross.superManagerVoteProc get consens title height", "title",title,"conesusHeight",consensHeight,"err", err.Error()) clog.Info("paracross.superManagerVoteProc get consens title height", "title", title, "conesusHeight", consensHeight, "err", err.Error())
return err return err
} }
consensMainHeight = stat.(*pt.ParacrossHeightStatus).MainHeight consensMainHeight = stat.(*pt.ParacrossHeightStatus).MainHeight
...@@ -621,11 +621,11 @@ func (a *action) nodeGroupApply(config *pt.ParaNodeGroupConfig) (*types.Receipt, ...@@ -621,11 +621,11 @@ func (a *action) nodeGroupApply(config *pt.ParaNodeGroupConfig) (*types.Receipt,
} }
stat := &pt.ParaNodeGroupStatus{Status: pt.ParacrossNodeGroupApply, stat := &pt.ParaNodeGroupStatus{Status: pt.ParacrossNodeGroupApply,
Title: config.Title, Title: config.Title,
ApplyAddr: strings.Join(addrs, ","), ApplyAddr: strings.Join(addrs, ","),
CoinsFrozen: config.CoinsFrozen, CoinsFrozen: config.CoinsFrozen,
MainHeight: a.exec.GetMainHeight(), MainHeight: a.exec.GetMainHeight(),
EmptyBlockInterval:config.EmptyBlockInterval} EmptyBlockInterval: config.EmptyBlockInterval}
saveNodeGroup(a.db, config.Title, stat) saveNodeGroup(a.db, config.Title, stat)
r := makeParaNodeGroupApplyReiceipt(config.Title, a.fromaddr, status, stat, pt.TyLogParaNodeGroupApply) r := makeParaNodeGroupApplyReiceipt(config.Title, a.fromaddr, status, stat, pt.TyLogParaNodeGroupApply)
receipt.KV = append(receipt.KV, r.KV...) receipt.KV = append(receipt.KV, r.KV...)
...@@ -661,11 +661,11 @@ func (a *action) nodeGroupQuit(config *pt.ParaNodeGroupConfig) (*types.Receipt, ...@@ -661,11 +661,11 @@ func (a *action) nodeGroupQuit(config *pt.ParaNodeGroupConfig) (*types.Receipt,
} }
stat := &pt.ParaNodeGroupStatus{Status: pt.ParacrossNodeGroupQuit, stat := &pt.ParaNodeGroupStatus{Status: pt.ParacrossNodeGroupQuit,
Title: config.Title, Title: config.Title,
ApplyAddr: status.ApplyAddr, ApplyAddr: status.ApplyAddr,
CoinsFrozen: status.CoinsFrozen, CoinsFrozen: status.CoinsFrozen,
MainHeight: a.exec.GetMainHeight(), MainHeight: a.exec.GetMainHeight(),
EmptyBlockInterval:status.EmptyBlockInterval} EmptyBlockInterval: status.EmptyBlockInterval}
saveNodeGroup(a.db, config.Title, stat) saveNodeGroup(a.db, config.Title, stat)
r := makeParaNodeGroupApplyReiceipt(config.Title, a.fromaddr, status, stat, pt.TyLogParaNodeGroupQuit) r := makeParaNodeGroupApplyReiceipt(config.Title, a.fromaddr, status, stat, pt.TyLogParaNodeGroupQuit)
receipt.KV = append(receipt.KV, r.KV...) receipt.KV = append(receipt.KV, r.KV...)
...@@ -736,11 +736,11 @@ func (a *action) nodeGroupApprove(config *pt.ParaNodeGroupConfig) (*types.Receip ...@@ -736,11 +736,11 @@ func (a *action) nodeGroupApprove(config *pt.ParaNodeGroupConfig) (*types.Receip
receipt.Logs = append(receipt.Logs, r.Logs...) receipt.Logs = append(receipt.Logs, r.Logs...)
stat := &pt.ParaNodeGroupStatus{Status: pt.ParacrossNodeGroupApprove, stat := &pt.ParaNodeGroupStatus{Status: pt.ParacrossNodeGroupApprove,
Title: config.Title, Title: config.Title,
ApplyAddr: status.ApplyAddr, ApplyAddr: status.ApplyAddr,
CoinsFrozen: status.CoinsFrozen, CoinsFrozen: status.CoinsFrozen,
MainHeight: a.exec.GetMainHeight(), MainHeight: a.exec.GetMainHeight(),
EmptyBlockInterval:status.EmptyBlockInterval} EmptyBlockInterval: status.EmptyBlockInterval}
saveNodeGroup(a.db, config.Title, stat) saveNodeGroup(a.db, config.Title, stat)
r = makeParaNodeGroupApplyReiceipt(config.Title, a.fromaddr, status, stat, pt.TyLogParaNodeGroupApprove) r = makeParaNodeGroupApplyReiceipt(config.Title, a.fromaddr, status, stat, pt.TyLogParaNodeGroupApprove)
receipt.KV = append(receipt.KV, r.KV...) receipt.KV = append(receipt.KV, r.KV...)
......
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