Miner block rewards test

internal/cli/model/model.go

@@ -293,11 +293,12 @@ type NodeList struct {
 }
 
 type DelegatePool struct {
-	Balance      int64  `json:"balance"`
-	Reward       int64  `json:"reward"`
-	Status       int    `json:"status"`
-	RoundCreated int64  `json:"round_created"` // used for cool down
-	DelegateID   string `json:"delegate_id"`
+	Balance              int64  `json:"balance"`
+	Reward               int64  `json:"reward"`
+	Status               int    `json:"status"`
+	RoundCreated         int64  `json:"round_created"` // used for cool down
+	DelegateID           string `json:"delegate_id"`
+	RoundPoolLastUpdated int64  `json:"round_pool_last_updated"`
 }
 
 type StakePool struct {
@@ -310,20 +311,20 @@ type StakePool struct {
 type Node struct {
 	SimpleNode  `json:"simple_miner"`
 	StakePool   `json:"stake_pool"`
-	Round       int64 `json:"round"`
 	TotalReward int64 `json:"total_reward"`
 }
 
 type SimpleNode struct {
-	ID         string      `json:"id"`
-	N2NHost    string      `json:"n2n_host"`
-	Host       string      `json:"host"`
-	Port       int         `json:"port"`
-	PublicKey  string      `json:"public_key"`
-	ShortName  string      `json:"short_name"`
-	BuildTag   string      `json:"build_tag"`
-	TotalStake int64       `json:"total_stake"`
-	Stat       interface{} `json:"stat"`
+	ID                            string      `json:"id"`
+	N2NHost                       string      `json:"n2n_host"`
+	Host                          string      `json:"host"`
+	Port                          int         `json:"port"`
+	PublicKey                     string      `json:"public_key"`
+	ShortName                     string      `json:"short_name"`
+	BuildTag                      string      `json:"build_tag"`
+	TotalStake                    int64       `json:"total_stake"`
+	Stat                          interface{} `json:"stat"`
+	RoundServiceChargeLastUpdated int64       `json:"round_service_charge_last_updated"`
 }
 
 type Sharder struct {
@@ -622,6 +623,60 @@ type EventDBTransaction struct {
 	Status            int    `json:"status"`
 }
 
+type Reward int
+
+const (
+	MinLockDemandReward Reward = iota
+	BlockRewardMiner
+	BlockRewardSharder
+	BlockRewardBlobber
+	FeeRewardMiner
+	FeeRewardSharder
+	ValidationReward
+	FileDownloadReward
+	ChallengePassReward
+	ChallengeSlashPenalty
+	CancellationChargeReward
+	NumOfRewards
+)
+
+var rewardString = []string{
+	"min lock demand",
+	"block_reward_miner",
+	"block_reward_sharder",
+	"block_reward_blobber",
+	"fees miner",
+	"fees sharder",
+	"validation reward",
+	"file download reward",
+	"challenge pass reward",
+	"challenge slash",
+	"cancellation charge",
+	"invalid",
+}
+
+func (r Reward) String() string {
+	return rewardString[r]
+}
+
+func (r Reward) Int() int {
+	return int(r)
+}
+
+type RewardProvider struct {
+	Amount      int64  `json:"amount"`
+	BlockNumber int64  `json:"block_number" gorm:"index:idx_block,priority:1"`
+	ProviderId  string `json:"provider_id" gorm:"index:idx_provider,priority:2"`
+	RewardType  Reward `json:"reward_type" gorm:"index:idx_reward_type,priority:3"`
+}
+
+type RewardDelegate struct {
+	Amount      int64  `json:"amount"`
+	BlockNumber int64  `json:"block_number" gorm:"index:idx_block,priority:1"`
+	PoolID      string `json:"pool_id" gorm:"index:idx_pool,priority:2"`
+	RewardType  Reward `json:"reward_type" gorm:"index:idx_reward_type,priority:3"`
+}
+
 type EventDBBlock struct {
 	Hash                  string               `json:"hash"`
 	Version               string               `json:"version"`

internal/cli/util/api_get_list.go

@@ -2,14 +2,60 @@ package cliutils
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"strconv"
 
 	"github.com/0chain/system_test/internal/api/util/test"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+func ApiGetRetries[T any](t *test.SystemTest, url string, params map[string]string, retries int) *T {
+	var err error
+	var res *T
+	for try := 1; try <= retries; try++ {
+		res, err = ApiGetError[T](url, params)
+		if err != nil {
+			t.Logf("retry %d, %v", try, err)
+		} else {
+			break
+		}
+	}
+	assert.NoError(t, err, "%s failed after %d retries", url, retries)
+
+	return res
+}
+
+func ApiGetError[T any](url string, params map[string]string) (*T, error) {
+	url = addParms(url, params)
+
+	res, err := http.Get(url) //nolint:gosec
+	if err != nil {
+		return nil, fmt.Errorf("with request %s, %v", url, err)
+	}
+
+	defer res.Body.Close()
+	if res.StatusCode < 200 && res.StatusCode >= 300 {
+		return nil, fmt.Errorf("failed API request %s, status code: %d: %v", url, res.StatusCode, err)
+	}
+	if res.Body == nil {
+		return nil, fmt.Errorf("request %s, API response must not be nil", url)
+	}
+	resBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, fmt.Errorf("response %s, reading response body: %v", url, err)
+	}
+
+	var result = new(T)
+	err = json.Unmarshal(resBody, &result)
+	if err != nil {
+		return nil, fmt.Errorf("deserializing JSON string `%s`: %v", string(resBody), err)
+	}
+	return result, nil
+}
+
 func ApiGet[T any](t *test.SystemTest, url string, params map[string]string) *T {
 	url = addParms(url, params)
 
@@ -38,8 +84,35 @@ func ApiGetList[T any](t *test.SystemTest, url string, params map[string]string,
 		raw := getNext(t, url, from, to, MaxQueryLimit, offset, params)
 
 		err := json.Unmarshal(raw, &temp)
-		require.NoError(t, err, "deserializing JSON string `%s`: %v", string(raw), err)
+		assert.NoError(t, err, "deserializing JSON string `%s`: %v", string(raw), err)
+		out = append(out, temp...)
+		if len(temp) < MaxQueryLimit {
+			return out
+		}
+
+		offset += int64(len(temp))
+	}
+}
+
+func ApiGetListRetries[T any](t *test.SystemTest, url string, params map[string]string, from, to int64, retries int) []T {
+	var out []T
+	var offset int64
+	for {
+		var temp []T
+		var raw []byte
+		var err error
+		for try := 1; try <= retries; try++ {
+			raw, err = getNextError(t, url, from, to, MaxQueryLimit, offset, params)
+			if err != nil {
+				t.Logf("retry %d, %v", try, err)
+			} else {
+				break
+			}
+		}
+		assert.NoError(t, err, "%s failed after %d retries", url, retries)
 
+		err = json.Unmarshal(raw, &temp)
+		assert.NoError(t, err, "deserializing JSON string `%s`: %v", string(raw), err)
 		out = append(out, temp...)
 		if len(temp) < MaxQueryLimit {
 			return out
@@ -49,8 +122,7 @@ func ApiGetList[T any](t *test.SystemTest, url string, params map[string]string,
 	}
 }
 
-//nolint
-func getNext(t *test.SystemTest, url string, from, to, limit, offset int64, params map[string]string) []byte {
+func getNextError(t *test.SystemTest, url string, from, to, limit, offset int64, params map[string]string) ([]byte, error) {
 	params["start"] = strconv.FormatInt(from, 10)
 	params["end"] = strconv.FormatInt(to, 10)
 	if limit > 0 {
@@ -60,8 +132,37 @@ func getNext(t *test.SystemTest, url string, from, to, limit, offset int64, para
 		params["offset"] = strconv.FormatInt(offset, 10)
 	}
 	url = addParms(url, params)
+	res, err := http.Get(url) //nolint:gosec
+	if err != nil {
+		return nil, fmt.Errorf("response %s; retrieving blocks %d to %d", url, from, to)
+	}
+	defer res.Body.Close()
+	if res.StatusCode < 200 && res.StatusCode >= 300 {
+		return nil, fmt.Errorf("failed API request %s, status code: %d: %v", url, res.StatusCode, err)
+	}
+	if res.Body == nil {
+		return nil, fmt.Errorf("request %s, API response must not be nil", url)
+	}
 
-	res, err := http.Get(url)
+	resBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, fmt.Errorf("response %s, reading response body: %v", url, err)
+	}
+
+	return resBody, nil
+}
+
+func getNext(t *test.SystemTest, url string, from, to, limit, offset int64, params map[string]string) []byte {
+	params["start"] = strconv.FormatInt(from, 10)
+	params["end"] = strconv.FormatInt(to, 10)
+	if limit > 0 {
+		params["limit"] = strconv.FormatInt(limit, 10)
+	}
+	if offset > 0 {
+		params["offset"] = strconv.FormatInt(offset, 10)
+	}
+	url = addParms(url, params)
+	res, err := http.Get(url) //nolint:gosec
 
 	require.NoError(t, err, "retrieving blocks %d to %d", from, to)
 	defer res.Body.Close()