fix: rename chunk count

ethersphere · Oct 9, 2024 · 3368d11 · 3368d11
1 parent 29ff1b9
commit 3368d11
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/openapi/SwarmCommon.yaml b/openapi/SwarmCommon.yaml
@@ -938,7 +938,7 @@ components:
       properties:
         address:
           type: string
-        chunkCount:
+        reserveSizeWithinRadius:
           type: integer
 
     StatusNeighborhoodsResponse:

diff --git a/pkg/api/status.go b/pkg/api/status.go
@@ -38,8 +38,8 @@ type statusResponse struct {
 }
 
 type statusNeighborhoodResponse struct {
-	Address    string `json:"address"`
-	ChunkCount int    `json:"chunkCount"`
+	Address                 string `json:"address"`
+	ReserveSizeWithinRadius int    `json:"reserveSizeWithinRadius"`
 }
 
 type neighborhoodsResponse struct {
@@ -201,8 +201,8 @@ func (s *Service) statusGetNeighborhoods(w http.ResponseWriter, _ *http.Request)
 			binaryAddr += fmt.Sprintf("%08b ", b)
 		}
 		neighborhoods = append(neighborhoods, statusNeighborhoodResponse{
-			Address:    binaryAddr,
-			ChunkCount: n.ChunkCount,
+			Address:                 binaryAddr,
+			ReserveSizeWithinRadius: n.ReserveSizeWithinRadius,
 		})
 	}
 

diff --git a/pkg/storer/reserve.go b/pkg/storer/reserve.go
@@ -498,8 +498,8 @@ func (db *DB) SubscribeBin(ctx context.Context, bin uint8, start uint64) (<-chan
 }
 
 type NeighborhoodStat struct {
-	Address    swarm.Address
-	ChunkCount int
+	Address                 swarm.Address
+	ReserveSizeWithinRadius int
 }
 
 func (db *DB) NeighborhoodsStat(ctx context.Context) ([]*NeighborhoodStat, error) {
@@ -517,7 +517,7 @@ func (db *DB) NeighborhoodsStat(ctx context.Context) ([]*NeighborhoodStat, error
 	err := db.reserve.IterateChunksItems(0, func(ch *reserve.ChunkBinItem) (bool, error) {
 		for _, n := range neighs {
 			if swarm.Proximity(ch.Address.Bytes(), n.Address.Bytes()) >= networkRadius {
-				n.ChunkCount++
+				n.ReserveSizeWithinRadius++
 				break
 			}
 		}

diff --git a/pkg/storer/reserve_test.go b/pkg/storer/reserve_test.go
@@ -723,8 +723,8 @@ func TestNeighborhoodStats(t *testing.T) {
 		}
 
 		for _, n := range neighs {
-			if n.ChunkCount != chunkCountPerPO {
-				t.Fatalf("chunk count does not match. wanted %d, got %d", chunkCountPerPO, n.ChunkCount)
+			if n.ReserveSizeWithinRadius != chunkCountPerPO {
+				t.Fatalf("chunk count does not match. wanted %d, got %d", chunkCountPerPO, n.ReserveSizeWithinRadius)
 			}
 		}
 
@@ -735,7 +735,7 @@ func TestNeighborhoodStats(t *testing.T) {
 
 	t.Run("disk", func(t *testing.T) {
 		t.Parallel()
-		opts := dbTestOps(baseAddr, 10000, nil, nil, time.Minute)
+		opts := dbTestOps(baseAddr, 100000, nil, nil, time.Minute)
 		opts.ReserveCapacityDoubling = int(doublingFactor)
 		storer, err := diskStorer(t, opts)()
 		if err != nil {
@@ -746,7 +746,7 @@ func TestNeighborhoodStats(t *testing.T) {
 	})
 	t.Run("mem", func(t *testing.T) {
 		t.Parallel()
-		opts := dbTestOps(baseAddr, 10000, nil, nil, time.Minute)
+		opts := dbTestOps(baseAddr, 100000, nil, nil, time.Minute)
 		opts.ReserveCapacityDoubling = int(doublingFactor)
 		storer, err := memStorer(t, opts)()
 		if err != nil {