update CalcTag (#261)

Author: AstaFrode

README.md

@@ -332,6 +332,7 @@ OK 0x59096fd095b66665c838f89ae4f1384ab31255cdc9c80003b05b50124cfdcfee
 +------------------+---------------------------+
 | total reward     | 2_613_109_650_924_024_640 |
 | claimed reward   | 534_235_750_855_578_370   |
+| unclaimed reward | 0                         |
 +------------------+---------------------------+
 ```
 

cmd/console/run.go

@@ -338,10 +338,10 @@ func runCmd(cmd *cobra.Command, args []string) {
 	tick_block := time.NewTicker(pattern.BlockInterval)
 	defer tick_block.Stop()
 
-	tick_Minute := time.NewTicker(time.Minute)
+	tick_Minute := time.NewTicker(time.Second * time.Duration(57))
 	defer tick_Minute.Stop()
 
-	tick_Hour := time.NewTicker(time.Hour)
+	tick_Hour := time.NewTicker(time.Second * time.Duration(3597))
 	defer tick_Hour.Stop()
 
 	out.Ok("Service started successfully")
@@ -405,7 +405,7 @@ func runCmd(cmd *cobra.Command, args []string) {
 
 			if len(calcTagCh) > 0 {
 				<-calcTagCh
-				go node.CalcTag(cli, cace, l, wspace, runtime, teeRecord, calcTagCh)
+				go node.CalcTag(cli, cace, l, runtime, teeRecord, wspace.GetFileDir(), calcTagCh)
 			}
 
 			if len(idleChallCh) > 0 || len(serviceChallCh) > 0 {

node/calculate_tag.go

@@ -39,7 +39,7 @@ type TagfileType struct {
 	Index        uint16  `protobuf:"bytes,6,opt,name=index,json=index,proto3" json:"index,omitempty"`
 }
 
-func CalcTag(cli sdk.SDK, cace cache.Cache, l logger.Logger, ws *Workspace, r *RunningState, teeRecord *TeeRecord, ch chan<- bool) {
+func CalcTag(cli sdk.SDK, cace cache.Cache, l logger.Logger, r *RunningState, teeRecord *TeeRecord, fileDir string, ch chan<- bool) {
 	r.SetCalcTagFlag(true)
 	defer func() {
 		ch <- true
@@ -49,9 +49,9 @@ func CalcTag(cli sdk.SDK, cace cache.Cache, l logger.Logger, ws *Workspace, r *R
 		}
 	}()
 
-	roothashs, err := utils.Dirs(ws.GetFileDir())
+	roothashs, err := utils.Dirs(fileDir)
 	if err != nil {
-		l.Stag("err", fmt.Sprintf("[Dirs(%s)] %v", ws.GetFileDir(), err))
+		l.Stag("err", fmt.Sprintf("[Dirs(%s)] %v", fileDir, err))
 		return
 	}
 
@@ -90,13 +90,19 @@ func calc_tag(cli sdk.SDK, cace cache.Cache, l logger.Logger, teeRecord *TeeReco
 		return nil
 	}
 
+	fmeta, err := cli.QueryFileMetadata(fid)
+	if err != nil {
+		l.Stag("info", fmt.Sprintf("[%s] QueryFileMetadata: %v", fid, err))
+		return nil
+	}
+
 	fragments, err = getAllFragment(file)
 	if err != nil {
 		l.Stag("err", fmt.Sprintf("[getAllFragment(%s)] %v", fid, err))
 		return nil
 	}
 
-	if len(fragments) == 0 {
+	if len(fragments) < len(fmeta.SegmentList) {
 		return nil
 	}