From 3a4d5f77a7a91ae6f9467918b09b17b02b44be13 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 27 Feb 2025 09:43:21 -0500 Subject: [PATCH] fix(ledger): remove unnecessary type conversions Signed-off-by: Chris Gianelloni --- ledger/alonzo/pparams.go | 8 ++++---- ledger/babbage/pparams.go | 8 ++++---- ledger/byron/byron.go | 8 +++----- ledger/common/address.go | 2 +- ledger/common/common.go | 6 +++--- ledger/conway/pparams.go | 8 ++++---- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/ledger/alonzo/pparams.go b/ledger/alonzo/pparams.go index f93e8d33..39fe10d6 100644 --- a/ledger/alonzo/pparams.go +++ b/ledger/alonzo/pparams.go @@ -190,12 +190,12 @@ func (p *AlonzoProtocolParameters) Utxorpc() *cardano.PParams { }, }, MaxExecutionUnitsPerTransaction: &cardano.ExUnits{ - Memory: uint64(p.MaxTxExUnits.Memory), - Steps: uint64(p.MaxTxExUnits.Steps), + Memory: p.MaxTxExUnits.Memory, + Steps: p.MaxTxExUnits.Steps, }, MaxExecutionUnitsPerBlock: &cardano.ExUnits{ - Memory: uint64(p.MaxBlockExUnits.Memory), - Steps: uint64(p.MaxBlockExUnits.Steps), + Memory: p.MaxBlockExUnits.Memory, + Steps: p.MaxBlockExUnits.Steps, }, } } diff --git a/ledger/babbage/pparams.go b/ledger/babbage/pparams.go index fe73766d..2a2e6959 100644 --- a/ledger/babbage/pparams.go +++ b/ledger/babbage/pparams.go @@ -229,12 +229,12 @@ func (p *BabbageProtocolParameters) Utxorpc() *cardano.PParams { }, }, MaxExecutionUnitsPerTransaction: &cardano.ExUnits{ - Memory: uint64(p.MaxTxExUnits.Memory), - Steps: uint64(p.MaxTxExUnits.Steps), + Memory: p.MaxTxExUnits.Memory, + Steps: p.MaxTxExUnits.Steps, }, MaxExecutionUnitsPerBlock: &cardano.ExUnits{ - Memory: uint64(p.MaxBlockExUnits.Memory), - Steps: uint64(p.MaxBlockExUnits.Steps), + Memory: p.MaxBlockExUnits.Memory, + Steps: p.MaxBlockExUnits.Steps, }, } } diff --git a/ledger/byron/byron.go b/ledger/byron/byron.go index 68d58751..4ac64bbd 100644 --- a/ledger/byron/byron.go +++ b/ledger/byron/byron.go @@ -112,10 +112,8 @@ func (h *ByronMainBlockHeader) BlockNumber() uint64 { } func (h *ByronMainBlockHeader) SlotNumber() uint64 { - return uint64( - (h.ConsensusData.SlotId.Epoch * ByronSlotsPerEpoch) + uint64( - h.ConsensusData.SlotId.Slot, - ), + return (h.ConsensusData.SlotId.Epoch * ByronSlotsPerEpoch) + uint64( + h.ConsensusData.SlotId.Slot, ) } @@ -548,7 +546,7 @@ func (h *ByronEpochBoundaryBlockHeader) BlockNumber() uint64 { } func (h *ByronEpochBoundaryBlockHeader) SlotNumber() uint64 { - return uint64(h.ConsensusData.Epoch * ByronSlotsPerEpoch) + return h.ConsensusData.Epoch * ByronSlotsPerEpoch } func (h *ByronEpochBoundaryBlockHeader) IssuerVkey() common.IssuerVkey { diff --git a/ledger/common/address.go b/ledger/common/address.go index 93443b5b..9967d64a 100644 --- a/ledger/common/address.go +++ b/ledger/common/address.go @@ -405,7 +405,7 @@ func (a Address) Bytes() []byte { ret := []byte{} ret = append( ret, - (byte(a.addressType)<<4)|(byte(a.networkId)&AddressHeaderNetworkMask), + (a.addressType<<4)|(a.networkId&AddressHeaderNetworkMask), ) ret = append(ret, a.paymentAddress...) ret = append(ret, a.stakingAddress...) diff --git a/ledger/common/common.go b/ledger/common/common.go index 8620b51f..059e53c9 100644 --- a/ledger/common/common.go +++ b/ledger/common/common.go @@ -40,7 +40,7 @@ func NewBlake2b256(data []byte) Blake2b256 { } func (b Blake2b256) String() string { - return hex.EncodeToString([]byte(b[:])) + return hex.EncodeToString(b[:]) } func (b Blake2b256) Bytes() []byte { @@ -71,7 +71,7 @@ func NewBlake2b224(data []byte) Blake2b224 { } func (b Blake2b224) String() string { - return hex.EncodeToString([]byte(b[:])) + return hex.EncodeToString(b[:]) } func (b Blake2b224) Bytes() []byte { @@ -106,7 +106,7 @@ func NewBlake2b160(data []byte) Blake2b160 { } func (b Blake2b160) String() string { - return hex.EncodeToString([]byte(b[:])) + return hex.EncodeToString(b[:]) } func (b Blake2b160) Bytes() []byte { diff --git a/ledger/conway/pparams.go b/ledger/conway/pparams.go index 746b57c2..3495caa2 100644 --- a/ledger/conway/pparams.go +++ b/ledger/conway/pparams.go @@ -132,12 +132,12 @@ func (p *ConwayProtocolParameters) Utxorpc() *cardano.PParams { }, }, MaxExecutionUnitsPerTransaction: &cardano.ExUnits{ - Memory: uint64(p.MaxTxExUnits.Memory), - Steps: uint64(p.MaxTxExUnits.Steps), + Memory: p.MaxTxExUnits.Memory, + Steps: p.MaxTxExUnits.Steps, }, MaxExecutionUnitsPerBlock: &cardano.ExUnits{ - Memory: uint64(p.MaxBlockExUnits.Memory), - Steps: uint64(p.MaxBlockExUnits.Steps), + Memory: p.MaxBlockExUnits.Memory, + Steps: p.MaxBlockExUnits.Steps, }, } }