From 48cfc79849b247e994c230482f41f21e52896b0f Mon Sep 17 00:00:00 2001
From: Lizhang <lizhang@polymerlabs.org>
Date: Sat, 18 Nov 2023 23:44:27 +0800
Subject: [PATCH] fix: patch the error due to rebase

---
 beacon-chain/rpc/eth/light-client/helpers.go  |  7 +++-
 .../eth/shared/structs_blocks_conversions.go  | 34 -------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/beacon-chain/rpc/eth/light-client/helpers.go b/beacon-chain/rpc/eth/light-client/helpers.go
index 73244f1044a7..744a73b2631e 100644
--- a/beacon-chain/rpc/eth/light-client/helpers.go
+++ b/beacon-chain/rpc/eth/light-client/helpers.go
@@ -292,9 +292,14 @@ func newLightClientUpdateToJSON(input *v2.LightClientUpdate) *LightClientUpdate
 		return nil
 	}
 
+	var nextSyncCommittee *shared.SyncCommittee
+	if input.NextSyncCommittee != nil {
+		nextSyncCommittee = shared.SyncCommitteeFromConsensus(migration.V2SyncCommitteeToV1Alpha1(input.NextSyncCommittee))
+	}
+
 	return &LightClientUpdate{
 		AttestedHeader:          shared.BeaconBlockHeaderFromConsensus(migration.V1HeaderToV1Alpha1(input.AttestedHeader)),
-		NextSyncCommittee:       shared.SyncCommitteeFromConsensus(migration.V2SyncCommitteeToV1Alpha1(input.NextSyncCommittee)),
+		NextSyncCommittee:       nextSyncCommittee,
 		NextSyncCommitteeBranch: branchToJSON(input.NextSyncCommitteeBranch),
 		FinalizedHeader:         shared.BeaconBlockHeaderFromConsensus(migration.V1HeaderToV1Alpha1(input.FinalizedHeader)),
 		FinalityBranch:          branchToJSON(input.FinalityBranch),
diff --git a/beacon-chain/rpc/eth/shared/structs_blocks_conversions.go b/beacon-chain/rpc/eth/shared/structs_blocks_conversions.go
index d025a4690140..e720f6ca5ebd 100644
--- a/beacon-chain/rpc/eth/shared/structs_blocks_conversions.go
+++ b/beacon-chain/rpc/eth/shared/structs_blocks_conversions.go
@@ -2005,40 +2005,6 @@ func BeaconBlockHeaderFromConsensus(h *eth.BeaconBlockHeader) *BeaconBlockHeader
 	}
 }
 
-func (header *BeaconBlockHeader) ToConsensus() (*eth.BeaconBlockHeader, error) {
-	if header == nil {
-		return nil, errNilValue
-	}
-
-	slot, err := strconv.ParseUint(header.Slot, 10, 64)
-	if err != nil {
-		return nil, NewDecodeError(err, "Slot")
-	}
-	proposerIndex, err := strconv.ParseUint(header.ProposerIndex, 10, 64)
-	if err != nil {
-		return nil, NewDecodeError(err, "ProposerIndex")
-	}
-	parentRoot, err := DecodeHexWithLength(header.ParentRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, NewDecodeError(err, "ParentRoot")
-	}
-	stateRoot, err := DecodeHexWithLength(header.StateRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, NewDecodeError(err, "StateRoot")
-	}
-	bodyRoot, err := DecodeHexWithLength(header.BodyRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, NewDecodeError(err, "BodyRoot")
-	}
-	return &eth.BeaconBlockHeader{
-		Slot:          primitives.Slot(slot),
-		ProposerIndex: primitives.ValidatorIndex(proposerIndex),
-		ParentRoot:    parentRoot,
-		StateRoot:     stateRoot,
-		BodyRoot:      bodyRoot,
-	}, nil
-}
-
 func BeaconBlockFromConsensus(b *eth.BeaconBlock) (*BeaconBlock, error) {
 	proposerSlashings := ProposerSlashingsFromConsensus(b.Body.ProposerSlashings)
 	attesterSlashings := AttesterSlashingsFromConsensus(b.Body.AttesterSlashings)