updata

plugin/dapp/paracross/executor/kv.go

@@ -43,9 +43,8 @@ var (
 	paraSupervisionNodes                string
 	paraSupervisionNodeGroupStatusAddrs string
 	paraSupervisionNodeGroupIDPrefix    string
-	//paraSupervisionNodeStatusAddrs      string
-	paraSupervisionNodeIDPrefix      string
-	paraSupervisionSelfConsensStages string
+	paraSupervisionNodeIDPrefix         string
+	paraSupervisionSelfConsensStages    string
 
 	localSupervisionNodeGroupStatusTitle string
 	localSupervisionNodeStatusTitle      string
@@ -81,7 +80,6 @@ func setPrefix() {
 	paraSupervisionNodes = "mavl-paracross-supervision-nodes-title-"
 	paraSupervisionNodeGroupStatusAddrs = "mavl-paracross-supervision-nodegroup-status-title-"
 	paraSupervisionNodeGroupIDPrefix = "mavl-paracross-title-nodegroupid-supervision-"
-	//paraSupervisionNodeStatusAddrs = "mavl-paracross-supervision-node-status-title-"
 	paraSupervisionNodeIDPrefix = "mavl-paracross-title-nodeid-supervision-"
 	paraSupervisionSelfConsensStages = "mavl-paracross-supervision-selfconsens-stages-"
 
@@ -223,14 +221,6 @@ func calcLocalSupervisionNodeStatusTitle(status int32, addr, title, id string) [
 	return []byte(fmt.Sprintf(localSupervisionNodeStatusTitle+"%s-%02d-%s-%s", addr, status, title, id))
 }
 
-//func calcLocalSupervisionNodeStatusPrefix(status int32, addr string) []byte {
-//	return []byte(fmt.Sprintf(localSupervisionNodeStatusTitle+"%02d-%s", status, addr))
-//}
-
-func calcLocalSupervisionNodeAllPrefix(addr string) []byte {
-	return []byte(fmt.Sprintf(localSupervisionNodeStatusTitle+"%s", addr))
-}
-
 //bind miner
 func calcParaBindMinerAddr(node, bind string) []byte {
 	return []byte(fmt.Sprintf(paraBindMinderAddr+"%s-%s", node, bind))
@@ -252,10 +242,6 @@ func calcParaSupervisionNodeGroupIDKey(title, hash string) string {
 	return fmt.Sprintf(paraSupervisionNodeGroupIDPrefix+"%s-%s", title, hash)
 }
 
-//func calcParaSupervisionNodeStatusKey(title string) []byte {
-//	return []byte(fmt.Sprintf(paraSupervisionNodeStatusAddrs+"%s", title))
-//}
-
 func calcParaSupervisionNodeIDKey(title, hash string) string {
 	return fmt.Sprintf(paraSupervisionNodeIDPrefix+"%s-%s", title, hash)
 }

plugin/dapp/paracross/executor/query.go

@@ -305,32 +305,6 @@ func (p *Paracross) Query_ListSupervisionNodeGroupStatus(in *pt.ReqParacrossNode
 	return resp, err
 }
 
-//
-////Query_ListSupervisionNodeStatus list node info by status
-//func (p *Paracross) Query_ListSupervisionNodeStatus(in *pt.ReqParacrossNodeInfo) (types.Message, error) {
-//	if in == nil {
-//		return nil, types.ErrInvalidParam
-//	}
-//	var prefix []byte
-//	prefix = calcLocalSupervisionNodeAllPrefix(in.Addr)
-//
-//	//resp, err := listNodeGroupStatus(p.GetLocalDB(), prefix)
-//	value, err := p.GetLocalDB().Get(prefix)
-//	if err != nil {
-//		return nil, err
-//	}
-//
-//	var rst pt.ParaNodeIdStatus
-//	err = types.Decode(value, &rst)
-//	if err != nil {
-//		return nil, err
-//	}
-//
-//	//rst.Id = getParaNodeIDSuffix(rst.Id)
-//
-//	return &rst, err
-//}
-
 //Query_ListTitles query paracross titles list
 func (p *Paracross) Query_ListTitles(in *types.ReqNil) (types.Message, error) {
 	return p.paracrossListTitles()

plugin/dapp/paracross/executor/supervisionaccount.go

@@ -333,7 +333,6 @@ func getSupervisionNodeAddr(db dbm.KV, title, addr string) (*pt.ParaNodeAddrIdSt
 func (a *action) updateSupervisionNodeAddrStatus(stat *pt.ParaNodeIdStatus) (*types.Receipt, error) {
 	addrStat, err := getNodeAddr(a.db, stat.Title, stat.TargetAddr)
 	if err != nil {
-		fmt.Println("QM_updateSupervisionNodeAddrStatus", "err", err)
 		if !isNotFound(err) {
 			return nil, errors.Wrapf(err, "nodeAddr:%s get error", stat.TargetAddr)
 		}