mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-09 15:37:56 -05:00
Use FastSSZ Everywhere Applicable (#6135)
* use fast ssz anywhere applicable * use fastssz clearly * Merge branch 'master' into use-fastssz * Apply suggestions from code review * imports * Update beacon-chain/p2p/fork.go * Merge branch 'master' into use-fastssz * update go-ssz * update go-ssz * Merge refs/heads/master into use-fastssz * Merge refs/heads/master into use-fastssz
This commit is contained in:
@@ -18,7 +18,6 @@ go_library(
|
||||
"//shared/testutil:go_default_library",
|
||||
"@com_github_pkg_errors//:go_default_library",
|
||||
"@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library",
|
||||
"@com_github_prysmaticlabs_go_ssz//:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
|
||||
"github.com/prysmaticlabs/go-ssz"
|
||||
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
|
||||
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
|
||||
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
|
||||
@@ -74,7 +73,7 @@ func generateGenesisBeaconState() error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
beaconBytes, err := ssz.Marshal(genesisState)
|
||||
beaconBytes, err := genesisState.MarshalSSZ()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -156,7 +155,7 @@ func generateMarshalledFullStateAndBlock() error {
|
||||
return err
|
||||
}
|
||||
|
||||
beaconBytes, err := ssz.Marshal(beaconState.InnerStateUnsafe())
|
||||
beaconBytes, err := beaconState.InnerStateUnsafe().MarshalSSZ()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -170,7 +169,7 @@ func generateMarshalledFullStateAndBlock() error {
|
||||
return err
|
||||
}
|
||||
|
||||
blockBytes, err := ssz.Marshal(block)
|
||||
blockBytes, err := block.MarshalSSZ()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -207,7 +206,7 @@ func generate2FullEpochState() error {
|
||||
}
|
||||
}
|
||||
|
||||
beaconBytes, err := ssz.Marshal(beaconState.InnerStateUnsafe())
|
||||
beaconBytes, err := beaconState.InnerStateUnsafe().MarshalSSZ()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -223,7 +222,7 @@ func genesisBeaconState() (*stateTrie.BeaconState, error) {
|
||||
return nil, errors.Wrap(err, "cannot read genesis state file")
|
||||
}
|
||||
genesisState := &pb.BeaconState{}
|
||||
if err := ssz.Unmarshal(beaconBytes, genesisState); err != nil {
|
||||
if err := genesisState.UnmarshalSSZ(beaconBytes); err != nil {
|
||||
return nil, errors.Wrap(err, "cannot unmarshal genesis state file")
|
||||
}
|
||||
return stateTrie.InitializeFromProtoUnsafe(genesisState)
|
||||
|
||||
Reference in New Issue
Block a user