cerc-io/ipld-eth-beacon-indexer
19
0
Fork 0
Code Issues 4 Pull Requests 2 Actions Packages Projects Releases 9 Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
Thomas E Lackey 2022-09-08 11:22:30 -05:00
parent 765480b12c
commit a97a2f1b60
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/beaconclient/consensus.go
View File

@ -13,17 +13,10 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
type Slot common.Slot
type Root common.Root
type Eth1Data common.Eth1Data type Eth1Data common.Eth1Data
type Root common.Root
type SignedBeaconBlock struct { type Signature common.BLSSignature
spec *common.Spec type Slot common.Slot
bellatrix *bellatrix.SignedBeaconBlock
altair *altair.SignedBeaconBlock
phase0 *phase0.SignedBeaconBlock
}
type BeaconBlock struct { type BeaconBlock struct {
spec *common.Spec spec *common.Spec
@ -33,6 +26,7 @@ type BeaconBlock struct {
} }
type BeaconBlockBody struct { type BeaconBlockBody struct {
spec *common.Spec
bellatrix *bellatrix.BeaconBlockBody bellatrix *bellatrix.BeaconBlockBody
altair *altair.BeaconBlockBody altair *altair.BeaconBlockBody
phase0 *phase0.BeaconBlockBody phase0 *phase0.BeaconBlockBody
@ -45,6 +39,13 @@ type BeaconState struct {
phase0 *phase0.BeaconState phase0 *phase0.BeaconState
} }
type SignedBeaconBlock struct {
spec *common.Spec
bellatrix *bellatrix.SignedBeaconBlock
altair *altair.SignedBeaconBlock
phase0 *phase0.SignedBeaconBlock
}
func (s *SignedBeaconBlock) UnmarshalSSZ(ssz []byte) error { func (s *SignedBeaconBlock) UnmarshalSSZ(ssz []byte) error {
spec := chooseSpec(s.spec) spec := chooseSpec(s.spec)
@ -133,20 +134,20 @@ func (s *SignedBeaconBlock) GetPhase0() *phase0.SignedBeaconBlock {
return s.phase0 return s.phase0
} }
func (s *SignedBeaconBlock) Signature() [96]byte { func (s *SignedBeaconBlock) Signature() Signature {
if s.IsBellatrix() { if s.IsBellatrix() {
return s.bellatrix.Signature return Signature(s.bellatrix.Signature)
} }
if s.IsAltair() { if s.IsAltair() {
return s.altair.Signature return Signature(s.altair.Signature)
} }
if s.IsPhase0() { if s.IsPhase0() {
return s.phase0.Signature return Signature(s.phase0.Signature)
} }
return [96]byte{} return Signature{}
} }
func (s *SignedBeaconBlock) Block() *BeaconBlock { func (s *SignedBeaconBlock) Block() *BeaconBlock {
@ -223,15 +224,15 @@ func (b *BeaconBlock) StateRoot() Root {
func (b *BeaconBlock) Body() *BeaconBlockBody { func (b *BeaconBlock) Body() *BeaconBlockBody {
if b.IsBellatrix() { if b.IsBellatrix() {
return &BeaconBlockBody{bellatrix: &b.bellatrix.Body} return &BeaconBlockBody{bellatrix: &b.bellatrix.Body, spec: b.spec}
} }
if b.IsAltair() { if b.IsAltair() {
return &BeaconBlockBody{altair: &b.altair.Body} return &BeaconBlockBody{altair: &b.altair.Body, spec: b.spec}
} }
if b.IsPhase0() { if b.IsPhase0() {
return &BeaconBlockBody{phase0: &b.phase0.Body} return &BeaconBlockBody{phase0: &b.phase0.Body, spec: b.spec}
} }
return nil return nil