From 3f98ddc61758131d06d55263b1aa61ffbb9b3eb2 Mon Sep 17 00:00:00 2001 From: Matheus Junior Date: Tue, 23 Jan 2024 12:49:32 -0300 Subject: [PATCH] be explicit about beacon state hardfork type --- merkle_util_test.go | 2 +- proof_utils.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/merkle_util_test.go b/merkle_util_test.go index 1a72b072..c56f57a8 100644 --- a/merkle_util_test.go +++ b/merkle_util_test.go @@ -763,7 +763,7 @@ type Proofs struct { WithdrawalFields []string `json:"WithdrawalFields"` } -func parseJSONFile(filePath string) (*beaconStateJSON, error) { +func parseJSONFile(filePath string) (*beaconStateJSONDeneb, error) { data, err := os.ReadFile(filePath) if err != nil { diff --git a/proof_utils.go b/proof_utils.go index 1b2f21cd..94a09c04 100644 --- a/proof_utils.go +++ b/proof_utils.go @@ -57,7 +57,7 @@ type BalanceUpdateProofs struct { ValidatorFields []string `json:"ValidatorFields"` } -type beaconStateJSON struct { +type beaconStateJSONDeneb struct { GenesisTime string `json:"genesis_time"` GenesisValidatorsRoot string `json:"genesis_validators_root"` Slot string `json:"slot"` @@ -120,7 +120,7 @@ type beaconStateJSONCapella struct { } type beaconStateVersion struct { - Data beaconStateJSON `json:"data"` + Data beaconStateJSONDeneb `json:"data"` } type beaconStateVersionCapella struct { @@ -248,7 +248,7 @@ func GetWithdrawalFields(w *capella.Withdrawal) []string { return withdrawalFields } -func ParseStateJSONFile(filePath string) (*beaconStateJSON, error) { +func ParseStateJSONFile(filePath string) (*beaconStateJSONDeneb, error) { data, err := ioutil.ReadFile(filePath) if err != nil { @@ -287,7 +287,7 @@ func ParseCapellaStateJSONFile(filePath string) (*beaconStateJSONCapella, error) } // nolint:gocyclo -func ParseDenebBeaconStateFromJSON(data beaconStateJSON, s *deneb.BeaconState) error { +func ParseDenebBeaconStateFromJSON(data beaconStateJSONDeneb, s *deneb.BeaconState) error { var err error if data.GenesisTime == "" {