AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-08 21:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused RootsArrayHashTreeRoot

Browse Source
This commit is contained in:
terence tsao
2021-03-17 11:24:05 -07:00
parent 67a831ce49
commit bf0bda30d1
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
beacon-chain/state/stateV0/field_root_vector.go
View File

@@ -4,20 +4,10 @@ import (
"bytes"
"github.com/pkg/errors"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/hashutil"
"github.com/prysmaticlabs/prysm/shared/htrutils"
)
// RootsArrayHashTreeRoot computes the Merkle root of arrays of 32-byte hashes, such as [64][32]byte
// according to the Simple Serialize specification of eth2.
func RootsArrayHashTreeRoot(vals [][]byte, length uint64, fieldName string) ([32]byte, error) {
if featureconfig.Get().EnableSSZCache {
return cachedHasher.arraysRoot(vals, length, fieldName)
}
return nocachedHasher.arraysRoot(vals, length, fieldName)
}
func (h *stateRootHasher) arraysRoot(input [][]byte, length uint64, fieldName string) ([32]byte, error) {
lock.Lock()
defer lock.Unlock()

47
beacon-chain/state/stateV0/field_trie_test.go
View File

@@ -1,24 +1,25 @@
package stateV0_test
package stateV0
import (
"strconv"
"testing"
types "github.com/prysmaticlabs/eth2-types"
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/testutil"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
"github.com/prysmaticlabs/prysm/shared/testutil/require"
)
func TestFieldTrie_NewTrie(t *testing.T) {
newState, _ := testutil.DeterministicGenesisState(t, 40)
newState, err := state(40)
require.NoError(t, err)
// 5 represents the enum value of state roots
trie, err := stateV0.NewFieldTrie(5, newState.StateRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot))
trie, err := NewFieldTrie(5, newState.StateRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot))
require.NoError(t, err)
root, err := stateV0.RootsArrayHashTreeRoot(newState.StateRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot), "StateRoots")
root, err := nocachedHasher.arraysRoot(newState.StateRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot), "StateRoots")
require.NoError(t, err)
newRoot, err := trie.TrieRoot()
require.NoError(t, err)
@@ -26,9 +27,11 @@ func TestFieldTrie_NewTrie(t *testing.T) {
}
func TestFieldTrie_RecomputeTrie(t *testing.T) {
newState, _ := testutil.DeterministicGenesisState(t, 32)
newState, err := state(32)
require.NoError(t, err)
// 10 represents the enum value of validators
trie, err := stateV0.NewFieldTrie(11, newState.Validators(), params.BeaconConfig().ValidatorRegistryLimit)
trie, err := NewFieldTrie(11, newState.Validators(), params.BeaconConfig().ValidatorRegistryLimit)
require.NoError(t, err)
changedIdx := []uint64{2, 29}
@@ -46,7 +49,7 @@ func TestFieldTrie_RecomputeTrie(t *testing.T) {
require.NoError(t, newState.UpdateValidatorAtIndex(types.ValidatorIndex(changedIdx[0]), changedVals[0]))
require.NoError(t, newState.UpdateValidatorAtIndex(types.ValidatorIndex(changedIdx[1]), changedVals[1]))
expectedRoot, err := stateV0.ValidatorRegistryRoot(newState.Validators())
expectedRoot, err := ValidatorRegistryRoot(newState.Validators())
require.NoError(t, err)
root, err := trie.RecomputeTrie(changedIdx, newState.Validators())
require.NoError(t, err)
@@ -54,9 +57,11 @@ func TestFieldTrie_RecomputeTrie(t *testing.T) {
}
func TestFieldTrie_CopyTrieImmutable(t *testing.T) {
newState, _ := testutil.DeterministicGenesisState(t, 32)
newState, err := state(32)
require.NoError(t, err)
// 12 represents the enum value of randao mixes.
trie, err := stateV0.NewFieldTrie(13, newState.RandaoMixes(), uint64(params.BeaconConfig().EpochsPerHistoricalVector))
trie, err := NewFieldTrie(13, newState.RandaoMixes(), uint64(params.BeaconConfig().EpochsPerHistoricalVector))
require.NoError(t, err)
newTrie := trie.CopyTrie()
@@ -75,3 +80,23 @@ func TestFieldTrie_CopyTrieImmutable(t *testing.T) {
t.Errorf("Wanted roots to be different, but they are the same: %#x", root)
}
}
func state(vCount uint64) (*BeaconState, error) {
validators := make([]*ethpb.Validator, vCount)
for i := 0; i < len(validators); i++ {
k := make([]byte, 48)
copy(k, strconv.Itoa(i))
validators[i] = &ethpb.Validator{
PublicKey: k,
WithdrawalCredentials: make([]byte, 32),
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
return InitializeFromProto(&pb.BeaconState{
Validators: validators,
BlockRoots: make([][]byte, params.BeaconConfig().SlotsPerHistoricalRoot),
StateRoots: make([][]byte, params.BeaconConfig().SlotsPerHistoricalRoot),
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
}