auto ci

plugin/dapp/paracross/executor/exec_del_local.go

@@ -77,7 +77,7 @@ func (e *Paracross) ExecDelLocal_NodeConfig(payload *pt.ParaNodeAddrConfig, tx *
 			}
 			key := calcLocalNodeTitleDone(g.Title, g.TargetAddr)
 			set.KV = append(set.KV, &types.KeyValue{Key: key, Value: nil})
-		}else if log.Ty == pt.TyLogParacrossCommitDone {
+		} else if log.Ty == pt.TyLogParacrossCommitDone {
 			var g pt.ReceiptParacrossDone
 			types.Decode(log.Log, &g)
 			g.Height = g.Height - 1

plugin/dapp/paracross/executor/exec_local.go

@@ -81,7 +81,7 @@ func (e *Paracross) ExecLocal_NodeConfig(payload *pt.ParaNodeAddrConfig, tx *typ
 			}
 			key := calcLocalNodeTitleDone(g.Title, g.TargetAddr)
 			set.KV = append(set.KV, &types.KeyValue{Key: key, Value: types.Encode(&g)})
-		}else if log.Ty == pt.TyLogParacrossCommitDone {
+		} else if log.Ty == pt.TyLogParacrossCommitDone {
 			var g pt.ReceiptParacrossDone
 			types.Decode(log.Log, &g)
 

plugin/dapp/paracross/executor/paracross.go

@@ -69,7 +69,6 @@ func (c *Paracross) checkTxGroup(tx *types.Transaction, index int) ([]*types.Tra
 
 func (c *Paracross) saveLocalParaTxs(tx *types.Transaction, isDel bool) (*types.LocalDBSet, error) {
 
-
 	var payload pt.ParacrossAction
 	err := types.Decode(tx.Payload, &payload)
 	if err != nil {
@@ -85,22 +84,22 @@ func (c *Paracross) saveLocalParaTxs(tx *types.Transaction, isDel bool) (*types.
 		return nil, err
 	}
 
-	return c.udpateLocalParaTxs(commit.Status.Title, commit.Status.Height,crossTxHashs,crossTxResult,isDel)
+	return c.udpateLocalParaTxs(commit.Status.Title, commit.Status.Height, crossTxHashs, crossTxResult, isDel)
 
 }
 
 //无法获取到commit tx信息，从commitDone 结构里面构建
-func (c *Paracross) saveLocalParaTxsFork(commitDone *pt.ReceiptParacrossDone,isDel bool) (*types.LocalDBSet, error) {
+func (c *Paracross) saveLocalParaTxsFork(commitDone *pt.ReceiptParacrossDone, isDel bool) (*types.LocalDBSet, error) {
 	status := &pt.ParacrossNodeStatus{
-		MainBlockHash: commitDone.MainBlockHash,
+		MainBlockHash:   commitDone.MainBlockHash,
 		MainBlockHeight: commitDone.MainBlockHeight,
-		Title: commitDone.Title,
-		Height: commitDone.Height,
-		BlockHash:commitDone.BlockHash,
-		TxResult: commitDone.TxResult,
-		TxHashs:  commitDone.TxHashs,
-		CrossTxResult: commitDone.CrossTxResult,
-		CrossTxHashs: commitDone.CrossTxHashs,
+		Title:           commitDone.Title,
+		Height:          commitDone.Height,
+		BlockHash:       commitDone.BlockHash,
+		TxResult:        commitDone.TxResult,
+		TxHashs:         commitDone.TxHashs,
+		CrossTxResult:   commitDone.CrossTxResult,
+		CrossTxHashs:    commitDone.CrossTxHashs,
 	}
 
 	crossTxHashs, crossTxResult, err := getCrossTxHashs(c.GetAPI(), status)
@@ -108,11 +107,11 @@ func (c *Paracross) saveLocalParaTxsFork(commitDone *pt.ReceiptParacrossDone,isD
 		return nil, err
 	}
 
-	return c.udpateLocalParaTxs(commitDone.Title, commitDone.Height,crossTxHashs,crossTxResult,isDel)
+	return c.udpateLocalParaTxs(commitDone.Title, commitDone.Height, crossTxHashs, crossTxResult, isDel)
 
 }
 
-func (c *Paracross) udpateLocalParaTxs(paraTitle string, paraHeight int64,crossTxHashs [][]byte, crossTxResult []byte, isDel bool) (*types.LocalDBSet, error) {
+func (c *Paracross) udpateLocalParaTxs(paraTitle string, paraHeight int64, crossTxHashs [][]byte, crossTxResult []byte, isDel bool) (*types.LocalDBSet, error) {
 	var set types.LocalDBSet
 
 	if len(crossTxHashs) == 0 {
@@ -139,7 +138,7 @@ func (c *Paracross) udpateLocalParaTxs(paraTitle string, paraHeight int64,crossT
 			return nil, err
 		}
 		if payload.Ty == pt.ParacrossActionAssetTransfer {
-			kv, err := c.updateLocalAssetTransfer(paraHeight,paraTx.Tx ,success, isDel)
+			kv, err := c.updateLocalAssetTransfer(paraHeight, paraTx.Tx, success, isDel)
 			if err != nil {
 				return nil, err
 			}
@@ -267,7 +266,7 @@ func (c *Paracross) initLocalAssetWithdraw(paraHeight int64, tx *types.Transacti
 	return &types.KeyValue{Key: key, Value: types.Encode(&asset)}, nil
 }
 
-func (c *Paracross) updateLocalAssetTransfer(paraHeight int64, tx *types.Transaction,  success, isDel bool) (*types.KeyValue, error) {
+func (c *Paracross) updateLocalAssetTransfer(paraHeight int64, tx *types.Transaction, success, isDel bool) (*types.KeyValue, error) {
 	clog.Debug("para execLocal", "tx hash", hex.EncodeToString(tx.Hash()))
 	key := calcLocalAssetKey(tx.Hash())
 

plugin/dapp/paracross/executor/superaccount.go

@@ -612,11 +612,11 @@ func (a *action) nodeVote(config *pt.ParaNodeAddrConfig) (*types.Receipt, error)
 			}
 			receipt = mergeReceipt(receipt, r)
 
-			if a.exec.GetMainHeight() > getDappForkHeight(pt.ForkLoopCheckCommitTxDone){
+			if a.exec.GetMainHeight() > getDappForkHeight(pt.ForkLoopCheckCommitTxDone) {
 				//node quit后，如果committx满足2/3目标，自动触发commitDone
-				r,err = a.loopCommitTxDone(config.Title)
-				if err != nil{
-					clog.Error("unpdateNodeGroup.loopCommitTxDone", "title", title,"err",err.Error())
+				r, err = a.loopCommitTxDone(config.Title)
+				if err != nil {
+					clog.Error("unpdateNodeGroup.loopCommitTxDone", "title", title, "err", err.Error())
 				}
 				receipt = mergeReceipt(receipt, r)
 			}
@@ -673,9 +673,9 @@ func unpdateNodeGroup(db dbm.KV, title, addr string, add bool) (*types.Receipt,
 			}
 		}
 	}
-	err = db.Set(key,types.Encode(&item))
+	err = db.Set(key, types.Encode(&item))
 	if err != nil {
-		return nil, errors.Wrapf(err,"unpdateNodeGroup set dbkey=%s",key)
+		return nil, errors.Wrapf(err, "unpdateNodeGroup set dbkey=%s", key)
 	}
 	return makeParaNodeGroupReceipt(title, &copyItem, &item), nil
 }

plugin/dapp/paracross/types/type.go

@@ -19,13 +19,13 @@ var (
 	// ForkCommitTx main chain support paracross commit tx
 	ForkCommitTx = "ForkParacrossCommitTx"
 	//平行链配置项对应主链的ForkCommitTx 高度
-	MainForkParacrossCommitTx="MainForkParacrossCommitTx"
+	MainForkParacrossCommitTx = "MainForkParacrossCommitTx"
 	// ParaSelfConsensForkHeight para self consens height string
 	ParaSelfConsensForkHeight = "MainParaSelfConsensusForkHeight"
 	//ForkLoopCheckCommitTxDone 循环检查共识交易done的fork
-	ForkLoopCheckCommitTxDone ="ForkLoopCheckCommitTxDone"
+	ForkLoopCheckCommitTxDone = "ForkLoopCheckCommitTxDone"
 	//MainLoopCheckCommitTxDoneForkHeight 平行链的配置项，对应主链的ForkLoopCheckCommitTxDone高度
-	MainLoopCheckCommitTxDoneForkHeight="MainLoopCheckCommitTxDoneForkHeight"
+	MainLoopCheckCommitTxDoneForkHeight = "MainLoopCheckCommitTxDoneForkHeight"
 )
 
 func init() {