From b55ef60f8cbeb3ae1c4b43e76bba0d15d893d670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20R=C3=B3=C5=BCa=C5=84ski?= Date: Wed, 26 Jun 2024 13:19:06 +0200 Subject: [PATCH] Cleanup unused methods --- activation/handler_v2_test.go | 6 +++--- activation/wire/wire_v1.go | 8 -------- activation/wire/wire_v2.go | 4 ---- common/types/activation.go | 8 -------- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/activation/handler_v2_test.go b/activation/handler_v2_test.go index e59f056f7f9..579e080a1a3 100644 --- a/activation/handler_v2_test.go +++ b/activation/handler_v2_test.go @@ -533,7 +533,7 @@ func TestHandlerV2_ProcessSoloATX(t *testing.T) { atxFromDb, err := atxs.Get(atxHandler.cdb, atx.ID()) require.NoError(t, err) - require.Equal(t, atx.TotalNumUnits(), atxFromDb.TotalNumUnits()) + require.Equal(t, atx.TotalNumUnits(), atxFromDb.NumUnits) }) t.Run("second ATX, increases space (nonce valid)", func(t *testing.T) { t.Parallel() @@ -553,7 +553,7 @@ func TestHandlerV2_ProcessSoloATX(t *testing.T) { atxFromDb, err := atxs.Get(atxHandler.cdb, atx.ID()) require.NoError(t, err) require.EqualValues(t, atx.VRFNonce, atxFromDb.VRFNonce) - require.Equal(t, min(prev.TotalNumUnits(), atx.TotalNumUnits()), atxFromDb.TotalNumUnits()) + require.Equal(t, min(prev.TotalNumUnits(), atx.TotalNumUnits()), atxFromDb.NumUnits) }) t.Run("second ATX, increases space (nonce invalid)", func(t *testing.T) { t.Parallel() @@ -598,7 +598,7 @@ func TestHandlerV2_ProcessSoloATX(t *testing.T) { // verify that the ATX was added to the DB and it has the lower effective num units atxFromDb, err := atxs.Get(atxHandler.cdb, atx.ID()) require.NoError(t, err) - require.Equal(t, min(prev.TotalNumUnits(), atx.TotalNumUnits()), atxFromDb.TotalNumUnits()) + require.Equal(t, min(prev.TotalNumUnits(), atx.TotalNumUnits()), atxFromDb.NumUnits) require.EqualValues(t, atx.VRFNonce, atxFromDb.VRFNonce) }) t.Run("can't find positioning ATX", func(t *testing.T) { diff --git a/activation/wire/wire_v1.go b/activation/wire/wire_v1.go index 2ad68925271..e0fe9506a3e 100644 --- a/activation/wire/wire_v1.go +++ b/activation/wire/wire_v1.go @@ -106,14 +106,6 @@ func (atx *ActivationTxV1) SetID(id types.ATXID) { atx.id = id } -func (atx *ActivationTxV1) Published() types.EpochID { - return atx.PublishEpoch -} - -func (atx *ActivationTxV1) TotalNumUnits() uint32 { - return atx.NumUnits -} - func (atx *ActivationTxV1) Sign(signer *signing.EdSigner) { if atx.PrevATXID == types.EmptyATXID { nodeID := signer.NodeID() diff --git a/activation/wire/wire_v2.go b/activation/wire/wire_v2.go index a3203511520..d439ffa20dd 100644 --- a/activation/wire/wire_v2.go +++ b/activation/wire/wire_v2.go @@ -136,10 +136,6 @@ func (atx *ActivationTxV2) Sign(signer *signing.EdSigner) { atx.Signature = signer.Sign(signing.ATX, atx.SignedBytes()) } -func (atx *ActivationTxV2) Published() types.EpochID { - return atx.PublishEpoch -} - func (atx *ActivationTxV2) TotalNumUnits() uint32 { var total uint32 for _, post := range atx.NiPosts { diff --git a/common/types/activation.go b/common/types/activation.go index 0bc7d650769..84af7ac1967 100644 --- a/common/types/activation.go +++ b/common/types/activation.go @@ -207,14 +207,6 @@ func (atx *ActivationTx) TargetEpoch() EpochID { return atx.PublishEpoch + 1 } -func (atx *ActivationTx) Published() EpochID { - return atx.PublishEpoch -} - -func (atx *ActivationTx) TotalNumUnits() uint32 { - return atx.NumUnits -} - // Golden returns true if atx is from a checkpoint snapshot. // a golden ATX is not verifiable, and is only allowed to be prev atx or positioning atx. func (atx *ActivationTx) Golden() bool {