Skip to content

Commit 4b7323b

Browse files
authored
fix/getevmkeys-improved (#21848)
1 parent e4f06a8 commit 4b7323b

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

core/capabilities/ccip/delegate.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,15 +304,14 @@ func (d *Delegate) getOCRKeys(ocrKeyBundleIDs job.JSONConfig) (map[string]ocr2ke
304304
}
305305

306306
func getKeys[K keystore.Key](ks Keystore[K]) ([]string, error) {
307-
result := make([]string, 0)
308-
309307
keys, err := ks.GetAll()
310308
if err != nil {
311309
return nil, fmt.Errorf("error getting all keys: %w", err)
312310
}
313311

314-
for _, key := range keys {
315-
result = append(result, key.ID())
312+
result := make([]string, len(keys))
313+
for i, key := range keys {
314+
result[i] = key.ID()
316315
}
317316

318317
return result, nil
@@ -356,14 +355,14 @@ func (d *Delegate) getTransmitterKeys(ctx context.Context, relayIDs []types.Rela
356355
}
357356

358357
func (d *Delegate) getEVMKeys(ctx context.Context, chainID *big.Int) ([]string, error) {
359-
result := make([]string, 0)
360358
ethKeys, err := d.keystore.Eth().EnabledAddressesForChain(ctx, chainID)
361359
if err != nil {
362-
return result, fmt.Errorf("error getting enabled addresses for chain: %s %w", chainID.String(), err)
360+
return nil, fmt.Errorf("error getting enabled addresses for chain: %s %w", chainID.String(), err)
363361
}
364362

365-
for _, key := range ethKeys {
366-
result = append(result, key.Hex())
363+
result := make([]string, len(ethKeys))
364+
for i, key := range ethKeys {
365+
result[i] = key.Hex()
367366
}
368367
return result, nil
369368
}

0 commit comments

Comments
 (0)