Skip to content

Commit 9dee22f

Browse files
authored
Pre-allocate slices (OffchainLabs#11317)
1 parent 52271cf commit 9dee22f

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

beacon-chain/cache/depositcache/pending_deposits.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (dc *DepositCache) PendingDeposits(ctx context.Context, untilBlk *big.Int)
5555

5656
depositCntrs := dc.PendingContainers(ctx, untilBlk)
5757

58-
var deposits []*ethpb.Deposit
58+
deposits := make([]*ethpb.Deposit, 0, len(depositCntrs))
5959
for _, dep := range depositCntrs {
6060
deposits = append(deposits, dep.Deposit)
6161
}
@@ -71,7 +71,7 @@ func (dc *DepositCache) PendingContainers(ctx context.Context, untilBlk *big.Int
7171
dc.depositsLock.RLock()
7272
defer dc.depositsLock.RUnlock()
7373

74-
var depositCntrs []*ethpb.DepositContainer
74+
depositCntrs := make([]*ethpb.DepositContainer, 0, len(dc.pendingDeposits))
7575
for _, ctnr := range dc.pendingDeposits {
7676
if untilBlk == nil || untilBlk.Uint64() >= ctnr.Eth1BlockHeight {
7777
depositCntrs = append(depositCntrs, ctnr)
@@ -139,7 +139,7 @@ func (dc *DepositCache) PrunePendingDeposits(ctx context.Context, merkleTreeInde
139139
dc.depositsLock.Lock()
140140
defer dc.depositsLock.Unlock()
141141

142-
var cleanDeposits []*ethpb.DepositContainer
142+
cleanDeposits := make([]*ethpb.DepositContainer, 0, len(dc.pendingDeposits))
143143
for _, dp := range dc.pendingDeposits {
144144
if dp.Index >= merkleTreeIndex {
145145
cleanDeposits = append(cleanDeposits, dp)

beacon-chain/core/helpers/genesis.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func UpdateGenesisEth1Data(state state.BeaconState, deposits []*ethpb.Deposit, e
1616
return nil, errors.New("no eth1data provided for genesis state")
1717
}
1818

19-
var leaves [][]byte
19+
leaves := make([][]byte, 0, len(deposits))
2020
for _, deposit := range deposits {
2121
if deposit == nil || deposit.Data == nil {
2222
return nil, fmt.Errorf("nil deposit or deposit with nil data cannot be processed: %v", deposit)

monitoring/prometheus/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (s *Service) healthzHandler(w http.ResponseWriter, r *http.Request) {
6666
Err string `json:"error"`
6767
}
6868
var hasError bool
69-
var statuses []serviceStatus
69+
statuses := make([]serviceStatus, 0, len(s.svcRegistry.Statuses()))
7070
for k, v := range s.svcRegistry.Statuses() {
7171
s := serviceStatus{
7272
Name: k.String(),

runtime/logging/logrus-prefixed-formatter/formatter.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func (f *TextFormatter) SetColorScheme(colorScheme *ColorScheme) {
167167

168168
func (f *TextFormatter) Format(entry *logrus.Entry) ([]byte, error) {
169169
var b *bytes.Buffer
170-
var keys []string = make([]string, 0, len(entry.Data))
170+
keys := make([]string, 0, len(entry.Data))
171171
for k := range entry.Data {
172172
keys = append(keys, k)
173173
}
@@ -380,12 +380,12 @@ func (f *TextFormatter) appendValue(b *bytes.Buffer, value interface{}) (err err
380380
// This is to not silently overwrite `time`, `msg` and `level` fields when
381381
// dumping it. If this code wasn't there doing:
382382
//
383-
// logrus.WithField("level", 1).Info("hello")
383+
// logrus.WithField("level", 1).Info("hello")
384384
//
385385
// would just silently drop the user provided level. Instead with this code
386386
// it'll be logged as:
387387
//
388-
// {"level": "info", "fields.level": 1, "msg": "hello", "time": "..."}
388+
// {"level": "info", "fields.level": 1, "msg": "hello", "time": "..."}
389389
func prefixFieldClashes(data logrus.Fields) {
390390
if t, ok := data["time"]; ok {
391391
data["fields.time"] = t

testing/assertions/assertions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func isNil(obj interface{}) bool {
135135
func LogsContain(loggerFn assertionLoggerFn, hook *test.Hook, want string, flag bool, msg ...interface{}) {
136136
_, file, line, _ := runtime.Caller(2)
137137
entries := hook.AllEntries()
138-
var logs []string
138+
logs := make([]string, 0, len(entries))
139139
match := false
140140
for _, e := range entries {
141141
msg, err := e.String()

testing/bls/utils/utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ func RetrieveFiles(name string, t *testing.T) ([]string, [][]byte) {
1717
testFiles, err := os.ReadDir(filepath)
1818
require.NoError(t, err)
1919

20-
var fileNames []string
21-
var fileContent [][]byte
20+
fileNames := make([]string, 0, len(testFiles))
21+
fileContent := make([][]byte, 0, len(testFiles))
2222
require.Equal(t, false, len(testFiles) == 0, "no files exist in directory")
2323
for _, f := range testFiles {
2424
// Remove .yml suffix

testing/endtoend/components/web3remotesigner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func (w *Web3RemoteSigner) PublicKeys(ctx context.Context) ([]bls.PublicKey, err
205205
return nil, errors.New("no keys returned")
206206
}
207207

208-
var pks []bls.PublicKey
208+
pks := make([]bls.PublicKey, 0, len(keys))
209209
for _, key := range keys {
210210
if ctx.Err() != nil {
211211
return nil, ctx.Err()

tools/eth1exporter/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func ToEther(o *big.Int) *big.Float {
121121

122122
// MetricsHTTP - HTTP response handler for /metrics.
123123
func MetricsHTTP(w http.ResponseWriter, _ *http.Request) {
124-
var allOut []string
124+
allOut := make([]string, 0, len(allWatching))
125125
total := big.NewFloat(0)
126126
for _, v := range allWatching {
127127
if v.Balance == "" {

0 commit comments

Comments
 (0)