fixed redundant calls

Author: johnuopini

go.sum

@@ -279,8 +279,6 @@ github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM52
 github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/korovkin/limiter v0.0.0-20220422174850-01f593e64cf7 h1:N3ses22gYxtKVl/lWjA9XdBcleoYw1dw2VgYBcM0ElI=
-github.com/korovkin/limiter v0.0.0-20220422174850-01f593e64cf7/go.mod h1:mM0lzivCxB6c8msz/LOP9lJgZxy92GXwGcNG1A7UZEE=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -432,8 +430,6 @@ github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPyS
 github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees=
 github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/zenthangplus/goccm v0.0.0-20211005163543-2f2e522aca15 h1:0UwX38TojH86Dl0n4OwPMNYy8hNs2NhtzwY4RlvANlA=
-github.com/zenthangplus/goccm v0.0.0-20211005163543-2f2e522aca15/go.mod h1:DUzu/BC4TkgUfXP8J1P6Md73Djt+0l0CHq001Pt4weA=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

internal/client/collators.go

@@ -243,14 +243,6 @@ func (c *Client) FetchCollatorInfo(
 	rank uint32,
 	cfg config.CollatorsPoolConfig,
 ) (CollatorInfo, error) {
-	s := time.Now().UnixMilli()
-	type collatorPerf struct {
-		AccountInfo float32
-		History     float32
-		Points      float32
-		Delegations float32
-	}
-	t := collatorPerf{}
 	account, _ := types.HexDecodeString(address)
 	var candidate candidateMetadataUnmarshal
 	err := c.GetStorageRawAt(
@@ -269,19 +261,16 @@ func (c *Client) FetchCollatorInfo(
 	if err != nil {
 		return CollatorInfo{}, err
 	}
-	t.AccountInfo = float32(time.Now().UnixMilli()-s) / 1000.0
 	// Get historyRounds
 	history, err := c.FetchCollatorHistory(address, cfg.HistoryRounds)
 	if err != nil {
 		return CollatorInfo{}, err
 	}
-	t.History = float32(time.Now().UnixMilli()-s) / 1000.0
 	// Get current points
 	blocks, err := c.FetchCollatorBlocks(address, c.SnapRound.Number, c.SnapBlock.Hash)
 	if err != nil {
 		return CollatorInfo{}, err
 	}
-	t.Points = float32(time.Now().UnixMilli()-s) / 1000.0
 	// Get amount from pool to avoid bugs in the candidate info data as happened in the past
 	pool, err := c.FetchSortedCandidatePool(c.SnapBlock.Hash)
 	if err != nil {
@@ -297,52 +286,12 @@ func (c *Client) FetchCollatorInfo(
 	// Get delegations if requested
 	cd := make([]DelegatorState, 0)
 	if cfg.Revokes {
-		var delegations struct {
-			Delegations []candidateDelegationUnmarshal
-		}
-		err = c.GetStorageRawAt(
-			"ParachainStaking",
-			"TopDelegations",
-			"Delegations<Balance>",
-			c.SnapBlock.Hash,
-			&delegations,
-			account,
-		)
+		cd, err = c.getDelegations(address)
 		if err != nil {
-			log.Printf("Cannot load delegations %v\n", err)
+			return CollatorInfo{}, err
 		}
-		// Fetch delegations
-		ch := make(chan async.Result[DelegatorState])
-		var wg sync.WaitGroup
-		for _, delegation := range delegations.Delegations {
-			wg.Add(1)
-			delegator := delegation.Owner
-			amount := delegation.Amount
-			go func() {
-				defer wg.Done()
-				ch <- async.ResultFrom(c.FetchDelegatorState(address, delegator, amount))
-			}()
-		}
-		// Wait channel
-		go func() {
-			wg.Wait()
-			close(ch)
-		}()
-		for r := range ch {
-			if r.Err != nil {
-				log.Printf("Unable to fetch delegator state %v\n", r.Err)
-			} else {
-				cd = append(cd, r.Value)
-			}
-		}
-		// Sort
-		sort.Slice(cd[:], func(i, j int) bool {
-			return cd[i].Amount.Balance.Cmp(cd[j].Amount.Balance) == 1
-		})
 	}
 	// Done
-	t.Delegations = float32(time.Now().UnixMilli()-s) / 1000.0
-	log.Printf("%v: %v", address, t)
 	return CollatorInfo{
 		Address:     address,
 		Selected:    selected,

internal/client/delegator.go

@@ -4,6 +4,7 @@ import (
 	"github.com/centrifuge/go-substrate-rpc-client/v4/types"
 	"log"
 	"math/big"
+	"sort"
 	"strings"
 )
 
@@ -26,22 +27,55 @@ type DelegatorState struct {
 	RevokeRound  uint32       `json:"revoke_round,omitempty"`
 }
 
-func (c *Client) FetchDelegatorState(collator string, address string, total TokenAmount) (DelegatorState, error) {
-	collatorAccount, _ := types.HexDecodeString(collator)
-	// Fetch revokes for collator
-	requests := make([]delegationScheduledRequestsUnmarshal, 0)
+func (c *Client) getDelegations(collator string) ([]DelegatorState, error) {
+	account, _ := types.HexDecodeString(collator)
+	cd := make([]DelegatorState, 0)
+	var delegations struct {
+		Delegations []candidateDelegationUnmarshal
+	}
 	err := c.GetStorageRawAt(
+		"ParachainStaking",
+		"TopDelegations",
+		"Delegations<Balance>",
+		c.SnapBlock.Hash,
+		&delegations,
+		account,
+	)
+	if err != nil {
+		log.Printf("Cannot load delegations %v\n", err)
+		return nil, err
+	}
+	// Fetch delegations
+	requests := make([]delegationScheduledRequestsUnmarshal, 0)
+	err = c.GetStorageRawAt(
 		"ParachainStaking",
 		"DelegationScheduledRequests",
 		"Vec<DelegationScheduledRequests<DelegatorState<Balance>>>",
 		c.SnapBlock.Hash,
 		&requests,
-		collatorAccount,
+		account,
 	)
 	if err != nil {
-		log.Printf("Unable to decode delegator state for %v\n", address)
-		return DelegatorState{}, err
+		log.Printf("Unable to decode delegator scheduled requests for %v\n", collator)
+		return nil, err
+	}
+	// Get state
+	for _, delegation := range delegations.Delegations {
+		cd = append(cd, c.getDelegatorState(requests, delegation.Owner, delegation.Amount))
 	}
+	// Sort
+	sort.Slice(cd[:], func(i, j int) bool {
+		return cd[i].Amount.Balance.Cmp(cd[j].Amount.Balance) == 1
+	})
+	// Done
+	return cd, nil
+}
+
+func (c *Client) getDelegatorState(
+	requests []delegationScheduledRequestsUnmarshal,
+	address string,
+	total TokenAmount,
+) DelegatorState {
 	revokeAmount := TokenAmount{big.NewInt(0)}
 	revokeReason := ""
 	revokeRound := uint32(0)
@@ -66,5 +100,5 @@ func (c *Client) FetchDelegatorState(collator string, address string, total Toke
 		RevokeReason: revokeReason,
 		RevokeRound:  revokeRound,
 	}
-	return r, nil
+	return r
 }

internal/client/delegator_test.go

@@ -97,7 +97,7 @@ func ServeChainData(config config.HttpConfig) {
 		panic(err)
 	}
 	// First update
-	err = chainData.Update(0)
+	err = chainData.Update(28)
 	if err != nil {
 		panic(err)
 	}