Skip to content

refactor: remove reflection when storing CBOR on decode #983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

refactor: remove reflection when storing CBOR on decode #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions ledger/allegra/allegra.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,14 @@ type AllegraBlock struct {
}

func (b *AllegraBlock) UnmarshalCBOR(cborData []byte) error {
return b.UnmarshalCbor(cborData, b)
type tAllegraBlock AllegraBlock
var tmp tAllegraBlock
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*b = AllegraBlock(tmp)
b.SetCbor(cborData)
return nil
}

func (AllegraBlock) Type() int {
Expand Down Expand Up @@ -152,7 +159,14 @@ type AllegraTransactionBody struct {
}

func (b *AllegraTransactionBody) UnmarshalCBOR(cborData []byte) error {
return b.UnmarshalCbor(cborData, b)
type tAllegraTransactionBody AllegraTransactionBody
var tmp tAllegraTransactionBody
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*b = AllegraTransactionBody(tmp)
b.SetCbor(cborData)
return nil
}

func (b *AllegraTransactionBody) Inputs() []common.TransactionInput {
Expand Down Expand Up @@ -219,8 +233,15 @@ type AllegraTransaction struct {
TxMetadata *cbor.LazyValue
}

func (t *AllegraTransaction) UnmarshalCBOR(data []byte) error {
return t.UnmarshalCbor(data, t)
func (t *AllegraTransaction) UnmarshalCBOR(cborData []byte) error {
type tAllegraTransaction AllegraTransaction
var tmp tAllegraTransaction
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*t = AllegraTransaction(tmp)
t.SetCbor(cborData)
return nil
}

func (AllegraTransaction) Type() int {
Expand Down
38 changes: 33 additions & 5 deletions ledger/alonzo/alonzo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,14 @@ type AlonzoBlock struct {
}

func (b *AlonzoBlock) UnmarshalCBOR(cborData []byte) error {
return b.UnmarshalCbor(cborData, b)
type tAlonzoBlock AlonzoBlock
var tmp tAlonzoBlock
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*b = AlonzoBlock(tmp)
b.SetCbor(cborData)
return nil
}

func (AlonzoBlock) Type() int {
Expand Down Expand Up @@ -166,7 +173,14 @@ type AlonzoTransactionBody struct {
}

func (b *AlonzoTransactionBody) UnmarshalCBOR(cborData []byte) error {
return b.UnmarshalCbor(cborData, b)
type tAlonzoTransactionBody AlonzoTransactionBody
var tmp tAlonzoTransactionBody
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*b = AlonzoTransactionBody(tmp)
b.SetCbor(cborData)
return nil
}

func (b *AlonzoTransactionBody) Inputs() []common.TransactionInput {
Expand Down Expand Up @@ -391,7 +405,14 @@ type AlonzoTransactionWitnessSet struct {
}

func (w *AlonzoTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
return w.UnmarshalCbor(cborData, w)
type tAlonzoTransactionWitnessSet AlonzoTransactionWitnessSet
var tmp tAlonzoTransactionWitnessSet
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*w = AlonzoTransactionWitnessSet(tmp)
w.SetCbor(cborData)
return nil
}

func (w AlonzoTransactionWitnessSet) Vkey() []common.VkeyWitness {
Expand Down Expand Up @@ -437,8 +458,15 @@ type AlonzoTransaction struct {
TxMetadata *cbor.LazyValue
}

func (t *AlonzoTransaction) UnmarshalCBOR(data []byte) error {
return t.UnmarshalCbor(data, t)
func (t *AlonzoTransaction) UnmarshalCBOR(cborData []byte) error {
type tAlonzoTransaction AlonzoTransaction
var tmp tAlonzoTransaction
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*t = AlonzoTransaction(tmp)
t.SetCbor(cborData)
return nil
}

func (AlonzoTransaction) Type() int {
Expand Down
47 changes: 41 additions & 6 deletions ledger/babbage/babbage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,14 @@ type BabbageBlock struct {
}

func (b *BabbageBlock) UnmarshalCBOR(cborData []byte) error {
return b.UnmarshalCbor(cborData, b)
type tBabbageBlock BabbageBlock
var tmp tBabbageBlock
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*b = BabbageBlock(tmp)
b.SetCbor(cborData)
return nil
}

func (BabbageBlock) Type() int {
Expand Down Expand Up @@ -174,7 +181,14 @@ type BabbageProtoVersion struct {
}

func (h *BabbageBlockHeader) UnmarshalCBOR(cborData []byte) error {
return h.UnmarshalCbor(cborData, h)
type tBabbageBlockHeader BabbageBlockHeader
var tmp tBabbageBlockHeader
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*h = BabbageBlockHeader(tmp)
h.SetCbor(cborData)
return nil
}

func (h *BabbageBlockHeader) Hash() common.Blake2b256 {
Expand Down Expand Up @@ -235,7 +249,14 @@ type BabbageTransactionBody struct {
}

func (b *BabbageTransactionBody) UnmarshalCBOR(cborData []byte) error {
return b.UnmarshalCbor(cborData, b)
type tBabbageTransactionBody BabbageTransactionBody
var tmp tBabbageTransactionBody
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*b = BabbageTransactionBody(tmp)
b.SetCbor(cborData)
return nil
}

func (b *BabbageTransactionBody) Inputs() []common.TransactionInput {
Expand Down Expand Up @@ -537,7 +558,14 @@ type BabbageTransactionWitnessSet struct {
}

func (w *BabbageTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
return w.UnmarshalCbor(cborData, w)
type tBabbageTransactionWitnessSet BabbageTransactionWitnessSet
var tmp tBabbageTransactionWitnessSet
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*w = BabbageTransactionWitnessSet(tmp)
w.SetCbor(cborData)
return nil
}

func (w BabbageTransactionWitnessSet) Vkey() []common.VkeyWitness {
Expand Down Expand Up @@ -582,8 +610,15 @@ type BabbageTransaction struct {
TxMetadata *cbor.LazyValue
}

func (t *BabbageTransaction) UnmarshalCBOR(data []byte) error {
return t.UnmarshalCbor(data, t)
func (t *BabbageTransaction) UnmarshalCBOR(cborData []byte) error {
type tBabbageTransaction BabbageTransaction
var tmp tBabbageTransaction
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*t = BabbageTransaction(tmp)
t.SetCbor(cborData)
return nil
}

func (BabbageTransaction) Type() int {
Expand Down
75 changes: 59 additions & 16 deletions ledger/byron/byron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,14 @@ type ByronMainBlockHeader struct {
}

func (h *ByronMainBlockHeader) UnmarshalCBOR(cborData []byte) error {
// Decode generically and store original CBOR
return h.UnmarshalCbor(cborData, h)
type tByronMainBlockHeader ByronMainBlockHeader
var tmp tByronMainBlockHeader
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*h = ByronMainBlockHeader(tmp)
h.SetCbor(cborData)
return nil
}

func (h *ByronMainBlockHeader) Hash() common.Blake2b256 {
Expand Down Expand Up @@ -137,9 +143,15 @@ type ByronTransaction struct {
Attributes *cbor.LazyValue
}

func (t *ByronTransaction) UnmarshalCBOR(data []byte) error {
// Decode generically and store original CBOR
return t.UnmarshalCbor(data, t)
func (t *ByronTransaction) UnmarshalCBOR(cborData []byte) error {
type tByronTransaction ByronTransaction
var tmp tByronTransaction
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*t = ByronTransaction(tmp)
t.SetCbor(cborData)
return nil
}

func (ByronTransaction) Type() int {
Expand Down Expand Up @@ -451,8 +463,15 @@ type ByronUpdateProposal struct {
Signature []byte
}

func (p *ByronUpdateProposal) UnmarshalCBOR(data []byte) error {
return p.UnmarshalCbor(data, p)
func (p *ByronUpdateProposal) UnmarshalCBOR(cborData []byte) error {
type tByronUpdateProposal ByronUpdateProposal
var tmp tByronUpdateProposal
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*p = ByronUpdateProposal(tmp)
p.SetCbor(cborData)
return nil
}

type ByronUpdateProposalBlockVersionMod struct {
Expand Down Expand Up @@ -488,9 +507,15 @@ type ByronMainBlockBody struct {
UpdPayload ByronUpdatePayload
}

func (b *ByronMainBlockBody) UnmarshalCBOR(data []byte) error {
// Decode generically and store original CBOR
return b.UnmarshalCbor(data, b)
func (b *ByronMainBlockBody) UnmarshalCBOR(cborData []byte) error {
type tByronMainBlockBody ByronMainBlockBody
var tmp tByronMainBlockBody
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*b = ByronMainBlockBody(tmp)
b.SetCbor(cborData)
return nil
}

type ByronEpochBoundaryBlockHeader struct {
Expand All @@ -512,8 +537,14 @@ type ByronEpochBoundaryBlockHeader struct {
}

func (h *ByronEpochBoundaryBlockHeader) UnmarshalCBOR(cborData []byte) error {
// Decode generically and store original CBOR
return h.UnmarshalCbor(cborData, h)
type tByronEpochBoundaryBlockHeader ByronEpochBoundaryBlockHeader
var tmp tByronEpochBoundaryBlockHeader
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*h = ByronEpochBoundaryBlockHeader(tmp)
h.SetCbor(cborData)
return nil
}

func (h *ByronEpochBoundaryBlockHeader) Hash() common.Blake2b256 {
Expand Down Expand Up @@ -567,8 +598,14 @@ type ByronMainBlock struct {
}

func (b *ByronMainBlock) UnmarshalCBOR(cborData []byte) error {
// Decode generically and store original CBOR
return b.UnmarshalCbor(cborData, b)
type tByronMainBlock ByronMainBlock
var tmp tByronMainBlock
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*b = ByronMainBlock(tmp)
b.SetCbor(cborData)
return nil
}

func (ByronMainBlock) Type() int {
Expand Down Expand Up @@ -628,8 +665,14 @@ type ByronEpochBoundaryBlock struct {
}

func (b *ByronEpochBoundaryBlock) UnmarshalCBOR(cborData []byte) error {
// Decode generically and store original CBOR
return b.UnmarshalCbor(cborData, b)
type tByronEpochBoundaryBlock ByronEpochBoundaryBlock
var tmp tByronEpochBoundaryBlock
if _, err := cbor.Decode(cborData, &tmp); err != nil {
return err
}
*b = ByronEpochBoundaryBlock(tmp)
b.SetCbor(cborData)
return nil
}

func (ByronEpochBoundaryBlock) Type() int {
Expand Down
Loading
Loading