github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused argument from field index (#12327)

Browse Source 
* Remove unused argument from field index

* bzl
This commit is contained in:
Radosław Kapka
2023-04-25 15:03:55 +02:00
committed by GitHub
parent efdda168c5
commit ebccdfadb5
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
beacon-chain/state/fieldtrie/BUILD.bazel
View File

@@ -15,7 +15,6 @@ go_library(
"//encoding/bytesutil:go_default_library",
"//math:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//runtime/version:go_default_library",
"@com_github_pkg_errors//:go_default_library",
],
)

5
beacon-chain/state/fieldtrie/field_trie_helpers.go
View File

@@ -12,7 +12,6 @@ import (
"github.com/prysmaticlabs/prysm/v4/encoding/bytesutil"
pmath "github.com/prysmaticlabs/prysm/v4/math"
ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/v4/runtime/version"
)
// ProofFromMerkleLayers creates a proof starting at the leaf index of the state Merkle layers.
@@ -41,7 +40,7 @@ func (f *FieldTrie) validateIndices(idxs []uint64) error {
}
for _, idx := range idxs {
if idx >= length {
return errors.Errorf("invalid index for field %s: %d >= length %d", f.field.String(version.Phase0), idx, length)
return errors.Errorf("invalid index for field %s: %d >= length %d", f.field.String(), idx, length)
}
}
return nil
@@ -57,7 +56,7 @@ func validateElements(field types.FieldIndex, dataType types.DataType, elements
}
val := reflect.Indirect(reflect.ValueOf(elements))
if uint64(val.Len()) > length {
return errors.Errorf("elements length is larger than expected for field %s: %d > %d", field.String(version.Phase0), val.Len(), length)
return errors.Errorf("elements length is larger than expected for field %s: %d > %d", field.String(), val.Len(), length)
}
return nil
}

6
beacon-chain/state/state-native/state_trie.go
View File

@@ -669,13 +669,13 @@ func (b *BeaconState) FieldReferencesCount() map[string]uint64 {
b.lock.RLock()
defer b.lock.RUnlock()
for i, f := range b.sharedFieldReferences {
refMap[i.String(b.version)] = uint64(f.Refs())
refMap[i.String()] = uint64(f.Refs())
}
for i, f := range b.stateFieldLeaves {
numOfRefs := uint64(f.FieldReference().Refs())
f.RLock()
if !f.Empty() {
refMap[i.String(b.version)+"_trie"] = numOfRefs
refMap[i.String()+"_trie"] = numOfRefs
}
f.RUnlock()
}
@@ -691,7 +691,7 @@ func (b *BeaconState) IsNil() bool {
func (b *BeaconState) rootSelector(ctx context.Context, field types.FieldIndex) ([32]byte, error) {
ctx, span := trace.StartSpan(ctx, "beaconState.rootSelector")
defer span.End()
span.AddAttributes(trace.StringAttribute("field", field.String(b.version)))
span.AddAttributes(trace.StringAttribute("field", field.String()))
switch field {
case types.GenesisTime:

2
beacon-chain/state/state-native/types/types.go
View File

@@ -25,7 +25,7 @@ const (
type FieldIndex int
// String returns the name of the field index.
func (f FieldIndex) String(_ int) string {
func (f FieldIndex) String() string {
switch f {
case GenesisTime:
return "genesisTime"