Skip to content

Commit 6646f65

Browse files
0oM4REslam-Nawara
authored andcommitted
refactor: standardize reward field names and JSON tags in NodeCapacityReward struct
1 parent 02e4c78 commit 6646f65

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

node-registrar/client/node_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,16 @@ func TestGetNodeCapacityRewards(t *testing.T) {
220220
require.NoError(err)
221221
expected := NodeCapacityReward{
222222
FarmerReward: 60.0,
223-
TfReward: 20.0,
224-
FpReward: 20.0,
223+
TFReward: 20.0,
224+
FPReward: 20.0,
225225
Total: 100.0,
226226
UpTimePercentage: 75.0,
227227
}
228228
require.Equal(expected, res)
229229
// Verify reward distribution percentages are correct
230230
require.InDelta(0.6, res.FarmerReward/res.Total, 0.001)
231-
require.InDelta(0.2, res.TfReward/res.Total, 0.001)
232-
require.InDelta(0.2, res.FpReward/res.Total, 0.001)
231+
require.InDelta(0.2, res.TFReward/res.Total, 0.001)
232+
require.InDelta(0.2, res.FPReward/res.Total, 0.001)
233233
})
234234

235235
t.Run("bad request due to invalid node ID format", func(t *testing.T) {

node-registrar/client/types.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ type Location struct {
6666
}
6767

6868
type NodeCapacityReward struct {
69-
FarmerReward float64 `json:"farmerReward"` // Reward amount for the node owner (60%)
70-
TfReward float64 `json:"tfReward"` // Reward amount for Threefold Foundation (20%)
71-
FpReward float64 `json:"fpReward"` // Reward amount for the Farming Pool (20%)
72-
Total float64 `json:"total"` // Total reward amount
73-
UpTimePercentage float64 `json:"uptimePercentage"` // Node's uptime percentage
69+
FarmerReward float64 `json:"FarmerReward"` // Reward amount for the node owner (60%)
70+
TFReward float64 `json:"TFReward"` // Reward amount for Threefold Foundation (20%)
71+
FPReward float64 `json:"FPReward"` // Reward amount for the Farming Pool (20%)
72+
Total float64 `json:"Total"` // Total reward amount
73+
UpTimePercentage float64 `json:"UptimePercentage"` // Node's uptime percentage
7474
}

node-registrar/client/utils_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ func serverHandler(r *http.Request, request, count int, require *require.Asserti
249249
require.Equal(http.MethodGet, r.Method)
250250
resp, err := json.Marshal(NodeCapacityReward{
251251
FarmerReward: 60.0,
252-
TfReward: 20.0,
253-
FpReward: 20.0,
252+
TFReward: 20.0,
253+
FPReward: 20.0,
254254
Total: 100.0,
255255
UpTimePercentage: 75.0,
256256
})

0 commit comments

Comments
 (0)