From 4b821d6f264ce6e04bdec67f0c347434ff98a2bb Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Mon, 12 Aug 2024 16:41:22 +0300 Subject: [PATCH] context: dedup code with more generic magic Less code, more fun. Signed-off-by: Roman Khimov --- context.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/context.go b/context.go index 1d048e6a..4ba3f65f 100644 --- a/context.go +++ b/context.go @@ -228,13 +228,9 @@ func (c *Context[H]) reset(view byte, ts uint64) { c.Validators = c.Config.GetValidators() n := len(c.Validators) - c.LastChangeViewPayloads = emptyPayloadSlice(c.LastChangeViewPayloads, n) + c.LastChangeViewPayloads = emptyReusableSlice(c.LastChangeViewPayloads, n) - if len(c.LastSeenMessage) == n { - clear(c.LastSeenMessage) - } else { - c.LastSeenMessage = make([]*HeightView, n) - } + c.LastSeenMessage = emptyReusableSlice(c.LastSeenMessage, n) c.blockProcessed = false c.preBlockProcessed = false } else { @@ -254,12 +250,12 @@ func (c *Context[H]) reset(view byte, ts uint64) { c.header = nil n := len(c.Validators) - c.ChangeViewPayloads = emptyPayloadSlice(c.ChangeViewPayloads, n) + c.ChangeViewPayloads = emptyReusableSlice(c.ChangeViewPayloads, n) if view == 0 { - c.PreCommitPayloads = emptyPayloadSlice(c.PreCommitPayloads, n) - c.CommitPayloads = emptyPayloadSlice(c.CommitPayloads, n) + c.PreCommitPayloads = emptyReusableSlice(c.PreCommitPayloads, n) + c.CommitPayloads = emptyReusableSlice(c.CommitPayloads, n) } - c.PreparationPayloads = emptyPayloadSlice(c.PreparationPayloads, n) + c.PreparationPayloads = emptyReusableSlice(c.PreparationPayloads, n) if c.Transactions == nil { // Init. c.Transactions = make(map[H]Transaction[H]) @@ -278,12 +274,12 @@ func (c *Context[H]) reset(view byte, ts uint64) { } } -func emptyPayloadSlice[H Hash](s []ConsensusPayload[H], n int) []ConsensusPayload[H] { +func emptyReusableSlice[E any](s []E, n int) []E { if len(s) == n { clear(s) return s } - return make([]ConsensusPayload[H], n) + return make([]E, n) } // Fill initializes consensus when node is a speaker.