Node split poc cache hare weights (#6697)

spacemeshos · Feb 7, 2025 · 9d30fa5 · 9d30fa5
1 parent 7365a96
commit 9d30fa5
Show file tree

Hide file tree

Showing 20 changed files with 1,281 additions and 949 deletions.
diff --git a/api/node/client/client.gen.go b/api/node/client/client.gen.go
diff --git a/api/node/client/client.go b/api/node/client/client.go
@@ -187,7 +187,7 @@ func (s *NodeService) HareRoundTemplate(
 }
 
 func (s *NodeService) TotalWeight(ctx context.Context, epoch types.EpochID) (uint64, error) {
-	resp, err := s.client.GetHareTotalWeightEpochWithResponse(ctx, epoch.Uint32())
+	resp, err := s.client.GetWeightsTotalEpochWithResponse(ctx, epoch.Uint32())
 	if err != nil {
 		return 0, fmt.Errorf("get total weight: %w", err)
 	}
@@ -200,7 +200,7 @@ func (s *NodeService) TotalWeight(ctx context.Context, epoch types.EpochID) (uin
 }
 
 func (s *NodeService) MinerWeight(ctx context.Context, epoch types.EpochID, node types.NodeID) (uint64, error) {
-	resp, err := s.client.GetHareWeightNodeIdEpochWithResponse(ctx, hex.EncodeToString(node.Bytes()), epoch.Uint32())
+	resp, err := s.client.GetWeightsMinerNodeIdEpochWithResponse(ctx, hex.EncodeToString(node.Bytes()), epoch.Uint32())
 	if err != nil {
 		return 0, fmt.Errorf("get miner weight: %w", err)
 	}
@@ -213,7 +213,7 @@ func (s *NodeService) MinerWeight(ctx context.Context, epoch types.EpochID, node
 }
 
 func (s *NodeService) Beacon(ctx context.Context, epoch types.EpochID) (types.Beacon, error) {
-	resp, err := s.client.GetHareBeaconEpochWithResponse(ctx, epoch.Uint32())
+	resp, err := s.client.GetBeaconEpochWithResponse(ctx, epoch.Uint32())
 	if err != nil {
 		return types.Beacon{}, fmt.Errorf("get hare beacon: %w", err)
 	}

diff --git a/api/node/client/client_e2e_test.go b/api/node/client/client_e2e_test.go
@@ -28,6 +28,7 @@ type mocks struct {
 	beacons    *server.MockbeaconService
 	poetDb     *server.MockpoetDB
 	hare       *server.Mockhare
+	weights    *server.Mockweights
 	publisher  *pubsubMocks.MockPublisher
 	proposals  *server.MockproposalBuilder
 }
@@ -41,6 +42,7 @@ func setupE2E(t *testing.T) (*client.NodeService, *mocks) {
 		beacons:    server.NewMockbeaconService(ctrl),
 		poetDb:     server.NewMockpoetDB(ctrl),
 		hare:       server.NewMockhare(ctrl),
+		weights:    server.NewMockweights(ctrl),
 		publisher:  pubsubMocks.NewMockPublisher(ctrl),
 		proposals:  server.NewMockproposalBuilder(ctrl),
 	}
@@ -50,6 +52,7 @@ func setupE2E(t *testing.T) (*client.NodeService, *mocks) {
 		m.publisher,
 		m.poetDb,
 		m.hare,
+		m.weights,
 		m.proposals,
 		log.Named("server"))
 
@@ -206,15 +209,16 @@ func Test_Hare(t *testing.T) {
 	svc, mock := setupE2E(t)
 	t.Run("total weight", func(t *testing.T) {
 		val := uint64(11)
-		mock.hare.EXPECT().TotalWeight(gomock.Any(), types.EpochID(112)).Return(val, nil)
+		mock.weights.EXPECT().TotalWeight(gomock.Any(), types.EpochID(112)).Return(val, nil)
 		v, err := svc.TotalWeight(context.Background(), 112)
 		require.NoError(t, err)
 		require.Equal(t, v, val)
 	})
 	t.Run("miner weight", func(t *testing.T) {
 		val := uint64(101)
-		mock.hare.EXPECT().MinerWeight(gomock.Any(), gomock.Any(), types.EpochID(113)).Return(val, nil)
-		v, err := svc.MinerWeight(context.Background(), 113, types.NodeID{})
+		nodeID := types.RandomNodeID()
+		mock.weights.EXPECT().MinerWeight(gomock.Any(), types.EpochID(113), nodeID).Return(val, nil)
+		v, err := svc.MinerWeight(context.Background(), 113, nodeID)
 		require.NoError(t, err)
 		require.Equal(t, v, val)
 	})

diff --git a/api/node/node_service.yaml b/api/node/node_service.yaml
@@ -167,11 +167,11 @@ paths:
                 $ref: "models/components.yaml#/components/schemas/HareRoundTemplate"
         "204":
           description: did not find a message to retrieve
-  /hare/total_weight/{epoch}:
+  /weights/total/{epoch}:
     get:
       summary: Get the total weight for epoch
       tags:
-        - "hare"
+        - "weights"
       parameters:
         - in: path
           name: epoch
@@ -191,13 +191,11 @@ paths:
                     format: uint64
                 required:
                   - weight
-        "204":
-          description: did not find a message to retrieve
-  /hare/weight/{node_id}/{epoch}:
+  /weights/miner/{node_id}/{epoch}:
     get:
       summary: Get the miner weight in epoch
       tags:
-        - "hare"
+        - "weights"
       parameters:
         - in: path
           name: node_id
@@ -222,19 +220,17 @@ paths:
                     format: uint64
                 required:
                   - weight
-        "204":
-          description: did not find a message to retrieve
         "400":
           description: Bad request
           content:
             plain/text:
               schema:
                 type: string
-  /hare/beacon/{epoch}:
+  /beacon/{epoch}:
     get:
       summary: Get the beacon value for an epoch
       tags:
-        - "hare"
+        - "beacon"
       parameters:
         - in: path
           name: epoch

diff --git a/api/node/server/mocks.go b/api/node/server/mocks.go