Commit 18d709fb authored by mdj33's avatar mdj33 Committed by vipwzw

linter

parent 0914efab
......@@ -609,9 +609,6 @@ func (a *action) loopCommitTxDone(title string) (*types.Receipt, error) {
receipt = mergeReceipt(receipt, r)
}
return receipt, nil
}
func (a *action) checkCommitTxDone(title string, stat *pt.ParacrossHeightStatus, nodes map[string]struct{}) (*types.Receipt, error) {
......
......@@ -155,19 +155,6 @@ func (c *Paracross) udpateLocalParaTxs(paraTitle string, paraHeight int64, cross
return &set, nil
}
func getCommitHeight(payload []byte) (int64, error) {
var a pt.ParacrossAction
err := types.Decode(payload, &a)
if err != nil {
return 0, err
}
if a.GetCommit() == nil {
return 0, types.ErrInvalidParam
}
return a.GetCommit().Status.Height, nil
}
func (c *Paracross) initLocalAssetTransfer(tx *types.Transaction, success, isDel bool) (*types.KeyValue, error) {
clog.Debug("para execLocal", "tx hash", hex.EncodeToString(tx.Hash()), "action name", log.Lazy{Fn: tx.ActionName})
key := calcLocalAssetKey(tx.Hash())
......
......@@ -18,13 +18,13 @@ var (
glog = log.New("module", ParaX)
// ForkCommitTx main chain support paracross commit tx
ForkCommitTx = "ForkParacrossCommitTx"
//平行链配置项对应主链的ForkCommitTx 高度
// MainForkParacrossCommitTx 平行链配置项对应主链的ForkCommitTx 高度
MainForkParacrossCommitTx = "MainForkParacrossCommitTx"
// ParaSelfConsensForkHeight para self consens height string
ParaSelfConsensForkHeight = "MainParaSelfConsensusForkHeight"
//ForkLoopCheckCommitTxDone 循环检查共识交易done的fork
// ForkLoopCheckCommitTxDone 循环检查共识交易done的fork
ForkLoopCheckCommitTxDone = "ForkLoopCheckCommitTxDone"
//MainLoopCheckCommitTxDoneForkHeight 平行链的配置项,对应主链的ForkLoopCheckCommitTxDone高度
// MainLoopCheckCommitTxDoneForkHeight 平行链的配置项,对应主链的ForkLoopCheckCommitTxDone高度
MainLoopCheckCommitTxDoneForkHeight = "MainLoopCheckCommitTxDoneForkHeight"
)
......
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