forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 02:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rename variables and optimize code

Browse source
This commit is contained in:
wanwiset25 2025-04-01 09:03:15 +04:00
parent 65e3a5534a
commit 4fc208b527
1 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
consensus/XDPoS/api.go
View file

@ -408,7 +408,11 @@ func (api *API) getEpochNumbersFromRewardFiles(begin, end *rpc.BlockNumber) ([]u
if beginHeader.Number.Cmp(endHeader.Number) > 0 { if beginHeader.Number.Cmp(endHeader.Number) > 0 {
return nil, errors.New("illegal begin and end block number, begin > end") return nil, errors.New("illegal begin and end block number, begin > end")
} }
if big.NewInt(1_500_000).Cmp(new(big.Int).Sub(endHeader.Number, beginHeader.Number)) < 0 { diff := new(big.Int).Sub(endHeader.Number, beginHeader.Number).Int64()
if diff < 0 {
return nil, errors.New("illegal begin and end block number, begin > end")
}
if diff > 1_500_000 {
return nil, errors.New("block range over limit of 1,500,000 blocks") return nil, errors.New("block range over limit of 1,500,000 blocks")
} }
files, err := os.ReadDir(common.StoreRewardFolder) files, err := os.ReadDir(common.StoreRewardFolder)
@ -444,31 +448,24 @@ func (api *API) getEpochNumbersFromRewardFiles(begin, end *rpc.BlockNumber) ([]u
} }
func getEpochReward(account common.Address, header *types.Header) (AccountEpochReward, error) { func getEpochReward(account common.Address, header *types.Header) (AccountEpochReward, error) {
var data map[string]interface{}
path := filepath.Join(common.StoreRewardFolder, header.Number.String()+"."+header.Hash().Hex()) path := filepath.Join(common.StoreRewardFolder, header.Number.String()+"."+header.Hash().Hex())
alternatePath := filepath.Join(common.StoreRewardFolder, header.Number.String()+"."+header.HashNoValidator().Hex())
file, err := os.Open(path) file, err := os.Open(path)
if err != nil { if err != nil {
file, err := os.Open(alternatePath) alternatePath := filepath.Join(common.StoreRewardFolder, header.Number.String()+"."+header.HashNoValidator().Hex())
file, err = os.Open(alternatePath)
if err != nil { if err != nil {
log.Warn("[getEpochReward] rewards file not found", "path", path, "alternatePath", alternatePath) log.Warn("[getEpochReward] rewards file not found", "path", path, "alternatePath", alternatePath)
return AccountEpochReward{}, err return AccountEpochReward{}, err
} }
defer file.Close() }
decoder := json.NewDecoder(file) defer file.Close()
decoder.UseNumber() decoder := json.NewDecoder(file)
if err := decoder.Decode(&data); err != nil { decoder.UseNumber()
log.Warn("[getEpochReward] Failed to decode JSON:", "err", err)
return AccountEpochReward{}, err var data map[string]interface{}
} if err := decoder.Decode(&data); err != nil {
} else { log.Warn("[getEpochReward] Failed to decode JSON:", "err", err)
defer file.Close() return AccountEpochReward{}, err
decoder := json.NewDecoder(file)
decoder.UseNumber()
if err := decoder.Decode(&data); err != nil {
log.Warn("[getEpochReward] Failed to decode JSON:", "err", err)
return AccountEpochReward{}, err
}
} }
epochReward := AccountEpochReward{ epochReward := AccountEpochReward{
@ -482,9 +479,9 @@ func getEpochReward(account common.Address, header *types.Header) (AccountEpochR
} }
func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map[string]interface{}) { func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map[string]interface{}) {
if val, exists := data["signers"]; exists { if signersData, exists := data["signers"]; exists {
if val, exists := val.(map[string]interface{})[account]; exists { if accountData, ok := signersData.(map[string]interface{})[account]; ok {
nodeReward := val.(map[string]interface{})["reward"] nodeReward := accountData.(map[string]interface{})["reward"]
delegatedReward := data["rewards"].(map[string]interface{})[account] delegatedReward := data["rewards"].(map[string]interface{})[account]
rewardObj.AccountStatus = statusMasternode rewardObj.AccountStatus = statusMasternode
nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10)
@ -498,9 +495,9 @@ func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map
} }
} }
if val, exists := data["signersProtector"]; exists { if signersData, exists := data["signersProtector"]; exists {
if val, exists := val.(map[string]interface{})[account]; exists { if accountData, ok := signersData.(map[string]interface{})[account]; ok {
nodeReward := val.(map[string]interface{})["reward"] nodeReward := accountData.(map[string]interface{})["reward"]
delegatedReward := data["rewardsProtector"].(map[string]interface{})[account] delegatedReward := data["rewardsProtector"].(map[string]interface{})[account]
rewardObj.AccountStatus = statusProtectornode rewardObj.AccountStatus = statusProtectornode
nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10)
@ -515,9 +512,9 @@ func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map
} }
if val, exists := data["signersObserver"]; exists { if signersData, exists := data["signersObserver"]; exists {
if val, exists := val.(map[string]interface{})[account]; exists { if accountData, ok := signersData.(map[string]interface{})[account]; ok {
nodeReward := val.(map[string]interface{})["reward"] nodeReward := accountData.(map[string]interface{})["reward"]
delegatedReward := data["rewardsObserver"].(map[string]interface{})[account] delegatedReward := data["rewardsObserver"].(map[string]interface{})[account]
rewardObj.AccountStatus = statusObservernode rewardObj.AccountStatus = statusObservernode
nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10)