testing on dev

masa-finance · Jul 19, 2024 · 34b0ed5 · 34b0ed5
1 parent bd0b360
commit 34b0ed5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/pkg/api/handlers_node.go b/pkg/api/handlers_node.go
@@ -270,10 +270,10 @@ func (api *API) GetFromDHT() gin.HandlerFunc {
 			logrus.WithFields(logrus.Fields{
 				"key":   keyStr,
 				"error": err,
-			}).Error("Failed to read data from DHT")
+			}).Debug("Failed to read data from DHT")
 			c.JSON(http.StatusInternalServerError, gin.H{
 				"success": false,
-				"message": "failed to read data",
+				"message": "no data",
 			})
 			return
 		}

diff --git a/pkg/oracle_node.go b/pkg/oracle_node.go
@@ -412,22 +412,28 @@ func updateBlocks(ctx context.Context, node *OracleNode, block *chain.Block) {
 		TransactionNonce: int(block.Nonce),
 	}
 
-	exists, _ := node.DHT.GetValue(ctx, "/db/blocks")
-
 	var existingBlocks Blocks
-	if exists != nil {
-		err := json.Unmarshal(exists, &existingBlocks)
-		if err != nil {
-			logrus.Errorf("Error unmarshalling existing block data: %v", err)
-		}
-		existingBlocks.BlockData = append(existingBlocks.BlockData, blockData)
-	} else {
-		existingBlocks = Blocks{
-			TransactionHash: blockData.TransactionHash,
-			BlockData:       []BlockData{blockData},
-		}
+	existingBlocks.BlockData = append(existingBlocks.BlockData, blockData)
+	existingBlocks = Blocks{
+		TransactionHash: blockData.TransactionHash,
+		BlockData:       []BlockData{blockData},
 	}
 
+	// exists, _ := node.DHT.GetValue(ctx, "/db/blocks")
+	// var existingBlocks Blocks
+	// if exists != nil {
+	// 	err := json.Unmarshal(exists, &existingBlocks)
+	// 	if err != nil {
+	// 		logrus.Errorf("Error unmarshalling existing block data: %v", err)
+	// 	}
+	// 	existingBlocks.BlockData = append(existingBlocks.BlockData, blockData)
+	// } else {
+	// 	existingBlocks = Blocks{
+	// 		TransactionHash: blockData.TransactionHash,
+	// 		BlockData:       []BlockData{blockData},
+	// 	}
+	// }
+
 	jsonData, err := json.Marshal(existingBlocks)
 	if err != nil {
 		logrus.Error(err)

diff --git a/pkg/workers/workers.go b/pkg/workers/workers.go
@@ -403,7 +403,7 @@ func MonitorWorkers(ctx context.Context, node *masa.OracleNode) {
 		return
 	}
 	if node.WorkerTracker == nil || node.WorkerTracker.WorkerStatusCh == nil {
-		logrus.Error("MonitorWorkers: WorkerTracker or WorkerStatusCh is nil")
+		logrus.Debug("MonitorWorkers: WorkerTracker or WorkerStatusCh is nil")
 		return
 	}
 
@@ -528,5 +528,5 @@ func processWork(data *pubsub2.Message, work string, startTime *time.Time, node
 	}
 	// @todo
 
-	updateRecords(node, workEvent)
+	// updateRecords(node, workEvent)
 }